]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Revert "V4L/DVB (8904): cx88: add missing unlock_kernel"
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Oct 2008 14:54:34 +0000 (07:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Oct 2008 14:54:34 +0000 (07:54 -0700)
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>
drivers/media/video/cx88/cx88-blackbird.c

index 6b922066a66011a79ce3dc8f476ece93898b9e33..9a1374a38ec75a315463c02e83f5c6ad113b6fb4 100644 (file)
@@ -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;
                }
        }