---

yaml --- r: 185341 b: refs/heads/master c: 063e20e h: refs/heads/master i: 185339: c7dce58 v: v3
git-mirror · Mar 2, 2010 · c61df5b · c61df5b
1 parent 9c43f70
commit c61df5b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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,15 +711,13 @@ 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:
 	usb_unlock_device(dev);
 	usb_put_dev(dev);
  out_free_ps:
 	kfree(ps);
-	unlock_kernel();
 	return ret;
 }