From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Oct 2008 14:54:34 +0000 (-0700)
Subject: Revert "V4L/DVB (8904): cx88: add missing unlock_kernel"
X-Git-Tag: v2.6.27~8
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e09e6e2b6a5daf653794926ab50a784b14b6de53;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 6b922066a66..9a1374a38ec 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;
 		}
 	}