diff options
Diffstat (limited to 'drivers/s390/net/claw.c')
-rw-r--r-- | drivers/s390/net/claw.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c index a86436a7a606..23d53bf9daf1 100644 --- a/drivers/s390/net/claw.c +++ b/drivers/s390/net/claw.c | |||
@@ -310,7 +310,7 @@ claw_probe(struct ccwgroup_device *cgdev) | |||
310 | printk(KERN_INFO "claw: variable cgdev =\n"); | 310 | printk(KERN_INFO "claw: variable cgdev =\n"); |
311 | dumpit((char *)cgdev, sizeof(struct ccwgroup_device)); | 311 | dumpit((char *)cgdev, sizeof(struct ccwgroup_device)); |
312 | #endif | 312 | #endif |
313 | privptr = kmalloc(sizeof(struct claw_privbk), GFP_KERNEL); | 313 | privptr = kzalloc(sizeof(struct claw_privbk), GFP_KERNEL); |
314 | if (privptr == NULL) { | 314 | if (privptr == NULL) { |
315 | probe_error(cgdev); | 315 | probe_error(cgdev); |
316 | put_device(&cgdev->dev); | 316 | put_device(&cgdev->dev); |
@@ -319,7 +319,6 @@ claw_probe(struct ccwgroup_device *cgdev) | |||
319 | CLAW_DBF_TEXT_(2,setup,"probex%d",-ENOMEM); | 319 | CLAW_DBF_TEXT_(2,setup,"probex%d",-ENOMEM); |
320 | return -ENOMEM; | 320 | return -ENOMEM; |
321 | } | 321 | } |
322 | memset(privptr,0x00,sizeof(struct claw_privbk)); | ||
323 | privptr->p_mtc_envelope= kmalloc( MAX_ENVELOPE_SIZE, GFP_KERNEL); | 322 | privptr->p_mtc_envelope= kmalloc( MAX_ENVELOPE_SIZE, GFP_KERNEL); |
324 | privptr->p_env = kmalloc(sizeof(struct claw_env), GFP_KERNEL); | 323 | privptr->p_env = kmalloc(sizeof(struct claw_env), GFP_KERNEL); |
325 | if ((privptr->p_mtc_envelope==NULL) || (privptr->p_env==NULL)) { | 324 | if ((privptr->p_mtc_envelope==NULL) || (privptr->p_env==NULL)) { |
@@ -1404,7 +1403,7 @@ add_claw_reads(struct net_device *dev, struct ccwbk* p_first, | |||
1404 | 1403 | ||
1405 | if ( privptr-> p_read_active_first ==NULL ) { | 1404 | if ( privptr-> p_read_active_first ==NULL ) { |
1406 | #ifdef DEBUGMSG | 1405 | #ifdef DEBUGMSG |
1407 | printk(KERN_INFO "%s:%s p_read_active_frist == NULL \n", | 1406 | printk(KERN_INFO "%s:%s p_read_active_first == NULL \n", |
1408 | dev->name,__FUNCTION__); | 1407 | dev->name,__FUNCTION__); |
1409 | printk(KERN_INFO "%s:%s Read active first/last changed \n", | 1408 | printk(KERN_INFO "%s:%s Read active first/last changed \n", |
1410 | dev->name,__FUNCTION__); | 1409 | dev->name,__FUNCTION__); |