From linux-usb-devel-admin@lists.sourceforge.net Fri Jan 6 14:32:41 2006 From: Oliver Neukum To: Thomas Winischhofer Content-Disposition: inline Message-Id: <200601062327.17654.oliver@neukum.org> Subject: USB: kzalloc in sisusbvga Date: Fri, 6 Jan 2006 23:27:17 +0100 this does two things: - use kzalloc where appropriate - correct error return codes in ioctl Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman --- drivers/usb/misc/sisusbvga/sisusb.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- gregkh-2.6.orig/drivers/usb/misc/sisusbvga/sisusb.c +++ gregkh-2.6/drivers/usb/misc/sisusbvga/sisusb.c @@ -3188,7 +3188,7 @@ sisusb_ioctl(struct inode *inode, struct break; default: - retval = -EINVAL; + retval = -ENOTTY; break; } @@ -3251,12 +3251,11 @@ static int sisusb_probe(struct usb_inter dev->devnum); /* Allocate memory for our private */ - if (!(sisusb = kmalloc(sizeof(*sisusb), GFP_KERNEL))) { + if (!(sisusb = kzalloc(sizeof(*sisusb), GFP_KERNEL))) { printk(KERN_ERR "sisusb: Failed to allocate memory for private data\n"); return -ENOMEM; } - memset(sisusb, 0, sizeof(*sisusb)); kref_init(&sisusb->kref); init_MUTEX(&(sisusb->lock));