aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/stv680.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-07-30 07:43:36 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 07:36:47 -0400
commitd56dc61265d2527a63ab5b0f03199a43cd89ca36 (patch)
treebea2a5b12fc120ca6e8797b2f16ad9696e0f25dd /drivers/media/video/stv680.c
parent95f73c5b57990c97047c200b8746ab62a360c5bc (diff)
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)
1086 int err = 0; 1086 int err = 0;
1087 1087
1088 /* we are called with the BKL held */ 1088 /* we are called with the BKL held */
1089 lock_kernel();
1089 stv680->user = 1; 1090 stv680->user = 1;
1090 err = stv_init (stv680); /* main initialization routine for camera */ 1091 err = stv_init (stv680); /* main initialization routine for camera */
1091 1092
@@ -1099,6 +1100,7 @@ static int stv_open (struct inode *inode, struct file *file)
1099 } 1100 }
1100 if (err) 1101 if (err)
1101 stv680->user = 0; 1102 stv680->user = 0;
1103 unlock_kernel();
1102 1104
1103 return err; 1105 return err;
1104} 1106}