summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/stv680.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-07-30 08:43:36 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 09:36:47 -0200
commitd56dc61265d2527a63ab5b0f03199a43cd89ca36 (patch)
treebea2a5b12fc120ca6e8797b2f16ad9696e0f25dd /drivers/media/video/stv680.c
parent95f73c5b57990c97047c200b8746ab62a360c5bc (diff)
downloadblackbird-op-linux-d56dc61265d2527a63ab5b0f03199a43cd89ca36.tar.gz
blackbird-op-linux-d56dc61265d2527a63ab5b0f03199a43cd89ca36.zip
V4L/DVB (8613): v4l: move BKL down to the driver level.
The BKL is now moved from the video_open function in v4l2-dev.c to the various drivers. It seems about a third of the drivers already has a lock of some sort protecting the open(), another third uses video_exclusive_open (yuck!) and the last third required adding the BKL in their open function. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/stv680.c')
-rw-r--r--drivers/media/video/stv680.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c
index dce947439459..b21a8d6827c4 100644
--- a/drivers/media/video/stv680.c
+++ b/drivers/media/video/stv680.c
@@ -1086,6 +1086,7 @@ static int stv_open (struct inode *inode, struct file *file)
int err = 0;
/* we are called with the BKL held */
+ lock_kernel();
stv680->user = 1;
err = stv_init (stv680); /* main initialization routine for camera */
@@ -1099,6 +1100,7 @@ static int stv_open (struct inode *inode, struct file *file)
}
if (err)
stv680->user = 0;
+ unlock_kernel();
return err;
}
OpenPOWER on IntegriCloud