diff options
author | Alessio Igor Bogani <abogani@texware.it> | 2010-03-01 08:10:56 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 16:21:31 -0400 |
commit | 41f2c6e89cf4d412e4b20803f5feb2b9b1560476 (patch) | |
tree | 127bcdb795b0efb9b6dd180200b77279253c6120 /drivers/usb | |
parent | d20db4b4e938aa8e4e5735b5a1b202de5800400e (diff) |
USB: sisusbvga: Remove the BKL from ioctl
Seems to me that BKL is not needed here because necessary locking is already
provided by mutex sisusb->lock.
Also change the returned value to long.
Signed-off-by: Alessio Igor Bogani <abogani@texware.it>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-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) | |||
2974 | struct sisusb_usb_data *sisusb; | 2974 | struct sisusb_usb_data *sisusb; |
2975 | struct sisusb_info x; | 2975 | struct sisusb_info x; |
2976 | struct sisusb_command y; | 2976 | struct sisusb_command y; |
2977 | int retval = 0; | 2977 | long retval = 0; |
2978 | u32 __user *argp = (u32 __user *)arg; | 2978 | u32 __user *argp = (u32 __user *)arg; |
2979 | 2979 | ||
2980 | if (!(sisusb = (struct sisusb_usb_data *)file->private_data)) | 2980 | if (!(sisusb = (struct sisusb_usb_data *)file->private_data)) |
2981 | return -ENODEV; | 2981 | return -ENODEV; |
2982 | 2982 | ||
2983 | lock_kernel(); | ||
2984 | mutex_lock(&sisusb->lock); | 2983 | mutex_lock(&sisusb->lock); |
2985 | 2984 | ||
2986 | /* Sanity check */ | 2985 | /* Sanity check */ |
@@ -3039,7 +3038,6 @@ sisusb_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
3039 | 3038 | ||
3040 | err_out: | 3039 | err_out: |
3041 | mutex_unlock(&sisusb->lock); | 3040 | mutex_unlock(&sisusb->lock); |
3042 | unlock_kernel(); | ||
3043 | return retval; | 3041 | return retval; |
3044 | } | 3042 | } |
3045 | 3043 | ||