Commit 66eb2e93 authored by Burman Yan's avatar Burman Yan Committed by Greg Kroah-Hartman

USB AUERSWALD: replace kmalloc+memset with kzalloc

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 071e0a2a
...@@ -1376,7 +1376,7 @@ static int auerchar_open (struct inode *inode, struct file *file) ...@@ -1376,7 +1376,7 @@ static int auerchar_open (struct inode *inode, struct file *file)
} }
/* we have access to the device. Now lets allocate memory */ /* 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) { if (ccp == NULL) {
err ("out of memory"); err ("out of memory");
ret = -ENOMEM; ret = -ENOMEM;
...@@ -1384,7 +1384,6 @@ static int auerchar_open (struct inode *inode, struct file *file) ...@@ -1384,7 +1384,6 @@ static int auerchar_open (struct inode *inode, struct file *file)
} }
/* Initialize device descriptor */ /* Initialize device descriptor */
memset( ccp, 0, sizeof(auerchar_t));
init_MUTEX( &ccp->mutex); init_MUTEX( &ccp->mutex);
init_MUTEX( &ccp->readmutex); init_MUTEX( &ccp->readmutex);
auerbuf_init (&ccp->bufctl); auerbuf_init (&ccp->bufctl);
...@@ -1912,14 +1911,13 @@ static int auerswald_probe (struct usb_interface *intf, ...@@ -1912,14 +1911,13 @@ static int auerswald_probe (struct usb_interface *intf,
return -ENODEV; return -ENODEV;
/* allocate memory for our device and initialize it */ /* 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) { if (cp == NULL) {
err ("out of memory"); err ("out of memory");
goto pfail; goto pfail;
} }
/* Initialize device descriptor */ /* Initialize device descriptor */
memset (cp, 0, sizeof(auerswald_t));
init_MUTEX (&cp->mutex); init_MUTEX (&cp->mutex);
cp->usbdev = usbdev; cp->usbdev = usbdev;
auerchain_init (&cp->controlchain); auerchain_init (&cp->controlchain);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment