From c61df5bd413b61efe5802629b7bec4cf1a348c40 Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Wed, 13 Jan 2010 15:31:48 +0100 Subject: [PATCH] --- yaml --- r: 185341 b: refs/heads/master c: 063e20eb980f281d8456c3b48f146107f5cb2338 h: refs/heads/master i: 185339: c7dce58465416718982cc1a2cd9a5df21fd16665 v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/devio.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 83f3e478c57d..829d0eb0938d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 554f76962d3a6eb5110415f1591aca83f96a84ae +refs/heads/master: 063e20eb980f281d8456c3b48f146107f5cb2338 diff --git a/trunk/drivers/usb/core/devio.c b/trunk/drivers/usb/core/devio.c index 825e0abfed0a..6e731507c0c4 100644 --- a/trunk/drivers/usb/core/devio.c +++ b/trunk/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; }