From f14a21760686b1e69750f4b3060d9fa325d459d6 Mon Sep 17 00:00:00 2001 From: Alessio Igor Bogani Date: Mon, 1 Mar 2010 14:10:56 +0100 Subject: [PATCH] --- yaml --- r: 195314 b: refs/heads/master c: 41f2c6e89cf4d412e4b20803f5feb2b9b1560476 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/misc/sisusbvga/sisusb.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index da392a604508..6de030e097a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d20db4b4e938aa8e4e5735b5a1b202de5800400e +refs/heads/master: 41f2c6e89cf4d412e4b20803f5feb2b9b1560476 diff --git a/trunk/drivers/usb/misc/sisusbvga/sisusb.c b/trunk/drivers/usb/misc/sisusbvga/sisusb.c index aae95a009bd5..63a6070a478a 100644 --- a/trunk/drivers/usb/misc/sisusbvga/sisusb.c +++ b/trunk/drivers/usb/misc/sisusbvga/sisusb.c @@ -2974,13 +2974,12 @@ sisusb_ioctl(struct file *file, unsigned int cmd, unsigned long arg) struct sisusb_usb_data *sisusb; struct sisusb_info x; struct sisusb_command y; - int retval = 0; + long retval = 0; u32 __user *argp = (u32 __user *)arg; if (!(sisusb = (struct sisusb_usb_data *)file->private_data)) return -ENODEV; - lock_kernel(); mutex_lock(&sisusb->lock); /* Sanity check */ @@ -3039,7 +3038,6 @@ sisusb_ioctl(struct file *file, unsigned int cmd, unsigned long arg) err_out: mutex_unlock(&sisusb->lock); - unlock_kernel(); return retval; }