diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-04-09 12:44:20 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-04-09 12:44:27 +1000 |
commit | 0d16cef44a765a333fd4078cb86a2a01c8d224e7 (patch) | |
tree | 2afb3e2fe01725f2583fce810acc5dbda175d175 /drivers/usb/misc/sisusbvga/sisusb.c | |
parent | 267af42a3834d37f609e38bab5116a274352f2d5 (diff) | |
parent | 50be717773eb1d77d0a02f1b307cfe7b36121d03 (diff) |
Merge branch 'quilt/usb'
Diffstat (limited to 'drivers/usb/misc/sisusbvga/sisusb.c')
-rw-r--r-- | drivers/usb/misc/sisusbvga/sisusb.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c index aae95a009bd5..63a6070a478a 100644 --- a/drivers/usb/misc/sisusbvga/sisusb.c +++ b/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; } |