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>

2 files changed, 15 insertions, 3 deletions

diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 9a1374a38ec7..1b7e2e44b802 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1057,12 +1057,15 @@ static int mpeg_open(struct inode *inode, struct file *file)
         struct cx8802_driver *drv = NULL;
         int err;
 
+        lock_kernel();
         dev = cx8802_get_device(inode);
 
         dprintk( 1, "%s\n", __func__);
 
-        if (dev == NULL)
+        if (dev == NULL) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         /* Make sure we can acquire the hardware */
         drv = cx8802_get_driver(dev, CX88_MPEG_BLACKBIRD);
@@ -1077,6 +1080,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
         if (blackbird_initialize_codec(dev) < 0) {
                 if (drv)
                         drv->request_release(drv);
+                unlock_kernel();
                 return -EINVAL;
         }
         dprintk(1,"open minor=%d\n",minor);
@@ -1086,6 +1090,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
         if (NULL == fh) {
                 if (drv)
                         drv->request_release(drv);
+                unlock_kernel();
                 return -ENOMEM;
         }
         file->private_data = fh;
@@ -1101,6 +1106,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
         /* FIXME: locking against other video device */
         cx88_set_scale(dev->core, dev->width, dev->height,
                         fh->mpegq.field);
+        unlock_kernel();
 
         return 0;
 }
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index ef4d56ea0027..61e03d4703f6 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -773,6 +773,7 @@ static int video_open(struct inode *inode, struct file *file)
         enum v4l2_buf_type type = 0;
         int radio = 0;
 
+        lock_kernel();
         list_for_each_entry(h, &cx8800_devlist, devlist) {
                 if (h->video_dev->minor == minor) {
                         dev  = h;
@@ -788,8 +789,10 @@ static int video_open(struct inode *inode, struct file *file)
                         dev   = h;
                 }
         }
-        if (NULL == dev)
+        if (NULL == dev) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         core = dev->core;
 
@@ -798,8 +801,10 @@ static int video_open(struct inode *inode, struct file *file)
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh),GFP_KERNEL);
-        if (NULL == fh)
+        if (NULL == fh) {
+                unlock_kernel();
                 return -ENOMEM;
+        }
         file->private_data = fh;
         fh->dev      = dev;
         fh->radio    = radio;
@@ -832,6 +837,7 @@ static int video_open(struct inode *inode, struct file *file)
                 cx88_set_stereo(core,V4L2_TUNER_MODE_STEREO,1);
                 cx88_call_i2c_clients(core,AUDC_SET_RADIO,NULL);
         }
+        unlock_kernel();
 
         return 0;
 }