Commit 92846fbb authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman

USB: BKL removal: ftdi-elan

BKL was not needed at all. Removed without replacement.
Signed-off-by: default avatarOliver Neukum <oliver@neukum.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 937f7131
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/kref.h> #include <linux/kref.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/smp_lock.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
...@@ -627,27 +626,22 @@ static int ftdi_elan_open(struct inode *inode, struct file *file) ...@@ -627,27 +626,22 @@ static int ftdi_elan_open(struct inode *inode, struct file *file)
int subminor; int subminor;
struct usb_interface *interface; struct usb_interface *interface;
lock_kernel();
subminor = iminor(inode); subminor = iminor(inode);
interface = usb_find_interface(&ftdi_elan_driver, subminor); interface = usb_find_interface(&ftdi_elan_driver, subminor);
if (!interface) { if (!interface) {
unlock_kernel();
printk(KERN_ERR "can't find device for minor %d\n", subminor); printk(KERN_ERR "can't find device for minor %d\n", subminor);
return -ENODEV; return -ENODEV;
} else { } else {
struct usb_ftdi *ftdi = usb_get_intfdata(interface); struct usb_ftdi *ftdi = usb_get_intfdata(interface);
if (!ftdi) { if (!ftdi) {
unlock_kernel();
return -ENODEV; return -ENODEV;
} else { } else {
if (down_interruptible(&ftdi->sw_lock)) { if (down_interruptible(&ftdi->sw_lock)) {
unlock_kernel();
return -EINTR; return -EINTR;
} else { } else {
ftdi_elan_get_kref(ftdi); ftdi_elan_get_kref(ftdi);
file->private_data = ftdi; file->private_data = ftdi;
unlock_kernel();
return 0; return 0;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment