]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
USB: sisusbvga: Remove the BKL from ioctl
authorAlessio Igor Bogani <abogani@texware.it>
Mon, 1 Mar 2010 13:10:56 +0000 (14:10 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 20 May 2010 20:21:31 +0000 (13:21 -0700)
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>
drivers/usb/misc/sisusbvga/sisusb.c

index aae95a009bd57c39c49cc4bbe866d1ffc95aeeb7..63a6070a478ae41ed9409de65b8b1fe630580034 100644 (file)
@@ -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;
 }