Skip to content

Commit

Permalink
USB AUERSWALD: replace kmalloc+memset with kzalloc
Browse files Browse the repository at this point in the history
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Burman Yan authored and Greg Kroah-Hartman committed Dec 20, 2006
1 parent 071e0a2 commit 66eb2e9
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/usb/misc/auerswald.c
Original file line number Diff line number Diff line change
Expand Up @@ -1376,15 +1376,14 @@ static int auerchar_open (struct inode *inode, struct file *file)
}

/* we have access to the device. Now lets allocate memory */
ccp = (pauerchar_t) kmalloc(sizeof(auerchar_t), GFP_KERNEL);
ccp = kzalloc(sizeof(auerchar_t), GFP_KERNEL);
if (ccp == NULL) {
err ("out of memory");
ret = -ENOMEM;
goto ofail;
}

/* Initialize device descriptor */
memset( ccp, 0, sizeof(auerchar_t));
init_MUTEX( &ccp->mutex);
init_MUTEX( &ccp->readmutex);
auerbuf_init (&ccp->bufctl);
Expand Down Expand Up @@ -1912,14 +1911,13 @@ static int auerswald_probe (struct usb_interface *intf,
return -ENODEV;

/* allocate memory for our device and initialize it */
cp = kmalloc (sizeof(auerswald_t), GFP_KERNEL);
cp = kzalloc (sizeof(auerswald_t), GFP_KERNEL);
if (cp == NULL) {
err ("out of memory");
goto pfail;
}

/* Initialize device descriptor */
memset (cp, 0, sizeof(auerswald_t));
init_MUTEX (&cp->mutex);
cp->usbdev = usbdev;
auerchain_init (&cp->controlchain);
Expand Down

0 comments on commit 66eb2e9

Please sign in to comment.