From b9f2256d13951c8629a888b4987eac741e8b0a91 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sat, 28 Mar 2009 09:38:29 -0300
Subject: [PATCH] --- yaml --- r: 138351 b: refs/heads/master c:
 3fd8ab30c1fe9118a13f4b55172067ee04ef7a67 h: refs/heads/master i:   138349:
 be14fb4c41a07a41999527050c8c41470be5aed6   138347:
 b2fb62409c6d17e6c3171eeaa4a4be3314f3c9c1   138343:
 ae2c922890e30f391accb487b7b7a576161bc61c   138335:
 6d7e685b72044c8c2514034904c1212598b9f93c v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/media/video/dabusb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3aded9049328..e26c441ff78e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce18c48593746d6c6777bda2488f15c8ae401c9e
+refs/heads/master: 3fd8ab30c1fe9118a13f4b55172067ee04ef7a67
diff --git a/trunk/drivers/media/video/dabusb.c b/trunk/drivers/media/video/dabusb.c
index 384da45807a0..ba3709bec3f0 100644
--- a/trunk/drivers/media/video/dabusb.c
+++ b/trunk/drivers/media/video/dabusb.c
@@ -675,7 +675,6 @@ static int dabusb_release (struct inode *inode, struct file *file)
 
 static long dabusb_ioctl (struct file *file, unsigned int cmd, unsigned long arg)
 {
-	lock_kernel();
 	pdabusb_t s = (pdabusb_t) file->private_data;
 	pbulk_transfer_t pbulk;
 	int ret = 0;
@@ -683,6 +682,7 @@ static long dabusb_ioctl (struct file *file, unsigned int cmd, unsigned long arg
 
 	dbg("dabusb_ioctl");
 
+	lock_kernel();
 	if (s->remove_pending) {
 		unlock_kernel();
 		return -EIO;