aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Neukum <oliver@neukum.org>2010-01-13 09:31:48 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-02 17:54:22 -0500
commit063e20eb980f281d8456c3b48f146107f5cb2338 (patch)
tree9fcc19ff66ec0a64e4e20c3b62fdb542b6c20394
parent554f76962d3a6eb5110415f1591aca83f96a84ae (diff)
USB: Remove BKL from usbdev_open()
Locking had long been changed making BKL redundant. Simply remove it. Signed-off-by: Oliver Neukum <oliver@neukum.org> Cc: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/core/devio.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 825e0abfed0a..6e731507c0c4 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -653,8 +653,6 @@ static int usbdev_open(struct inode *inode, struct file *file)
653 const struct cred *cred = current_cred(); 653 const struct cred *cred = current_cred();
654 int ret; 654 int ret;
655 655
656 lock_kernel();
657
658 ret = -ENOMEM; 656 ret = -ENOMEM;
659 ps = kmalloc(sizeof(struct dev_state), GFP_KERNEL); 657 ps = kmalloc(sizeof(struct dev_state), GFP_KERNEL);
660 if (!ps) 658 if (!ps)
@@ -713,7 +711,6 @@ static int usbdev_open(struct inode *inode, struct file *file)
713 usb_unlock_device(dev); 711 usb_unlock_device(dev);
714 snoop(&dev->dev, "opened by process %d: %s\n", task_pid_nr(current), 712 snoop(&dev->dev, "opened by process %d: %s\n", task_pid_nr(current),
715 current->comm); 713 current->comm);
716 unlock_kernel();
717 return ret; 714 return ret;
718 715
719 out_unlock_device: 716 out_unlock_device:
@@ -721,7 +718,6 @@ static int usbdev_open(struct inode *inode, struct file *file)
721 usb_put_dev(dev); 718 usb_put_dev(dev);
722 out_free_ps: 719 out_free_ps:
723 kfree(ps); 720 kfree(ps);
724 unlock_kernel();
725 return ret; 721 return ret;
726} 722}
727 723