linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / usb / misc / sisusbvga / sisusb.c

diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 196c879..3260d59 100644 (file)
--- 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 = -ENOTTY;
+                       retval = -EINVAL;
                        break;
        }
 
@@ -3251,11 +3251,12 @@ static int sisusb_probe(struct usb_interface *intf,
                dev->devnum);
 
        /* Allocate memory for our private */
-       if (!(sisusb = kzalloc(sizeof(*sisusb), GFP_KERNEL))) {
+       if (!(sisusb = kmalloc(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));