From: Oliver Neukum Date: Wed, 13 Jan 2010 14:31:48 +0000 (+0100) Subject: USB: Remove BKL from usbdev_open() X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=063e20eb980f281d8456c3b48f146107f5cb2338;p=openwrt%2Fstaging%2Fblogic.git USB: Remove BKL from usbdev_open() Locking had long been changed making BKL redundant. Simply remove it. Signed-off-by: Oliver Neukum Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman --- 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) const struct cred *cred = current_cred(); int ret; - lock_kernel(); - ret = -ENOMEM; ps = kmalloc(sizeof(struct dev_state), GFP_KERNEL); if (!ps) @@ -713,7 +711,6 @@ static int usbdev_open(struct inode *inode, struct file *file) usb_unlock_device(dev); snoop(&dev->dev, "opened by process %d: %s\n", task_pid_nr(current), current->comm); - unlock_kernel(); return ret; out_unlock_device: @@ -721,7 +718,6 @@ static int usbdev_open(struct inode *inode, struct file *file) usb_put_dev(dev); out_free_ps: kfree(ps); - unlock_kernel(); return ret; }