summaryrefslogtreecommitdiffstats
path: root/drivers/usb/misc
diff options
context:
space:
mode:
authorOliver Neukum <oliver@neukum.org>2006-01-06 23:27:17 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2006-03-20 14:49:54 -0800
commit9ee884cc89dc339276c719ab4ff53913ac03d083 (patch)
tree9d916c7ba07302edcff383c98e8eef97950d12ae /drivers/usb/misc
parent06d694748b5173d972d7e4169173adad62ee67c0 (diff)
downloadop-kernel-dev-9ee884cc89dc339276c719ab4ff53913ac03d083.zip
op-kernel-dev-9ee884cc89dc339276c719ab4ff53913ac03d083.tar.gz
[PATCH] USB: kzalloc in sisusbvga
this does two things: - use kzalloc where appropriate - correct error return codes in ioctl Signed-off-by: Oliver Neukum <oliver@neukum.name> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/misc')
-rw-r--r--drivers/usb/misc/sisusbvga/sisusb.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 3260d59..196c879 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -3188,7 +3188,7 @@ sisusb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
break;
default:
- retval = -EINVAL;
+ retval = -ENOTTY;
break;
}
@@ -3251,12 +3251,11 @@ static int sisusb_probe(struct usb_interface *intf,
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));
OpenPOWER on IntegriCloud