summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-07 07:54:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-07 07:54:34 -0700
commite09e6e2b6a5daf653794926ab50a784b14b6de53 (patch)
treed5ce03321d397198d35a5e5e21d6f9622ddd6a82
parent4330ed8ed4da360ac1ca14b0fddff4c05b10de16 (diff)
Revert "V4L/DVB (8904): cx88: add missing unlock_kernel"
This reverts commit 135aedc38e812b922aa56096f36a3d72ffbcf2fb, as requested by Hans Verkuil. It was a patch for 2.6.28 where the BKL was pushed down from v4l core to the drivers, not for 2.6.27! Requested-by: Hans Verkuil <hverkuil@xs4all.nl> Cc: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-of-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 6b922066a660..9a1374a38ec7 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1070,7 +1070,6 @@ static int mpeg_open(struct inode *inode, struct file *file)
err = drv->request_acquire(drv);
if(err != 0) {
dprintk(1,"%s: Unable to acquire hardware, %d\n", __func__, err);
- unlock_kernel();
return err;
}
}