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, 5 insertions, 0 deletions

diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index 70c65a745923..3a4eb444a7c3 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -407,15 +407,18 @@ static int usb_dsbr100_open(struct inode *inode, struct file *file)
 {
         struct dsbr100_device *radio=video_get_drvdata(video_devdata(file));
 
+        lock_kernel();
         radio->users = 1;
         radio->muted = 1;
 
         if (dsbr100_start(radio)<0) {
                 warn("Radio did not start up properly");
                 radio->users = 0;
+                unlock_kernel();
                 return -EIO;
         }
         dsbr100_setfreq(radio, radio->curfreq);
+        unlock_kernel();
         return 0;
 }
 
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c
index 16c7ef20265c..337d55793836 100644
--- a/drivers/media/radio/radio-si470x.c
+++ b/drivers/media/radio/radio-si470x.c
@@ -1074,6 +1074,7 @@ static int si470x_fops_open(struct inode *inode, struct file *file)
         struct si470x_device *radio = video_get_drvdata(video_devdata(file));
         int retval;
 
+        lock_kernel();
         radio->users++;
 
         retval = usb_autopm_get_interface(radio->intf);
@@ -1090,6 +1091,7 @@ static int si470x_fops_open(struct inode *inode, struct file *file)
         }
 
 done:
+        unlock_kernel();
         return retval;
 }