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;