aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/misc
diff options
context:
space:
mode:
authorOliver Neukum <oliver@neukum.org>2010-01-14 10:12:01 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-02 17:54:30 -0500
commit92846fbb861f64b9db21f06d6878ca02c67554dc (patch)
tree7334fa443d61c4465d55188095b889b28836255b /drivers/usb/misc
parent937f7131d7ea7762851c89a410c83e1c4b393234 (diff)
USB: BKL removal: ftdi-elan
BKL was not needed at all. Removed without replacement. Signed-off-by: Oliver Neukum <oliver@neukum.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/misc')
-rw-r--r--drivers/usb/misc/ftdi-elan.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c
index 32c47fbee288..1edb6d361896 100644
--- a/drivers/usb/misc/ftdi-elan.c
+++ b/drivers/usb/misc/ftdi-elan.c
@@ -45,7 +45,6 @@
45#include <linux/module.h> 45#include <linux/module.h>
46#include <linux/kref.h> 46#include <linux/kref.h>
47#include <linux/mutex.h> 47#include <linux/mutex.h>
48#include <linux/smp_lock.h>
49#include <asm/uaccess.h> 48#include <asm/uaccess.h>
50#include <linux/usb.h> 49#include <linux/usb.h>
51#include <linux/workqueue.h> 50#include <linux/workqueue.h>
@@ -627,27 +626,22 @@ static int ftdi_elan_open(struct inode *inode, struct file *file)
627 int subminor; 626 int subminor;
628 struct usb_interface *interface; 627 struct usb_interface *interface;
629 628
630 lock_kernel();
631 subminor = iminor(inode); 629 subminor = iminor(inode);
632 interface = usb_find_interface(&ftdi_elan_driver, subminor); 630 interface = usb_find_interface(&ftdi_elan_driver, subminor);
633 631
634 if (!interface) { 632 if (!interface) {
635 unlock_kernel();
636 printk(KERN_ERR "can't find device for minor %d\n", subminor); 633 printk(KERN_ERR "can't find device for minor %d\n", subminor);
637 return -ENODEV; 634 return -ENODEV;
638 } else { 635 } else {
639 struct usb_ftdi *ftdi = usb_get_intfdata(interface); 636 struct usb_ftdi *ftdi = usb_get_intfdata(interface);
640 if (!ftdi) { 637 if (!ftdi) {
641 unlock_kernel();
642 return -ENODEV; 638 return -ENODEV;
643 } else { 639 } else {
644 if (down_interruptible(&ftdi->sw_lock)) { 640 if (down_interruptible(&ftdi->sw_lock)) {
645 unlock_kernel();
646 return -EINTR; 641 return -EINTR;
647 } else { 642 } else {
648 ftdi_elan_get_kref(ftdi); 643 ftdi_elan_get_kref(ftdi);
649 file->private_data = ftdi; 644 file->private_data = ftdi;
650 unlock_kernel();
651 return 0; 645 return 0;
652 } 646 }
653 } 647 }