aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa5246a.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/saa5246a.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/saa5246a.c')
-rw-r--r--drivers/media/video/saa5246a.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index 6ee63e69b36c..e2c538ee88f2 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -44,6 +44,7 @@
44#include <linux/init.h> 44#include <linux/init.h>
45#include <linux/i2c.h> 45#include <linux/i2c.h>
46#include <linux/videotext.h> 46#include <linux/videotext.h>
47#include <linux/smp_lock.h>
47#include <linux/videodev.h> 48#include <linux/videodev.h>
48#include <media/v4l2-common.h> 49#include <media/v4l2-common.h>
49#include <media/v4l2-ioctl.h> 50#include <media/v4l2-ioctl.h>
@@ -737,9 +738,12 @@ static int saa5246a_open(struct inode *inode, struct file *file)
737 struct saa5246a_device *t = vd->priv; 738 struct saa5246a_device *t = vd->priv;
738 int err; 739 int err;
739 740
741 lock_kernel();
740 err = video_exclusive_open(inode,file); 742 err = video_exclusive_open(inode,file);
741 if (err < 0) 743 if (err < 0) {
744 unlock_kernel();
742 return err; 745 return err;
746 }
743 747
744 if (t->client==NULL) { 748 if (t->client==NULL) {
745 err = -ENODEV; 749 err = -ENODEV;
@@ -776,11 +780,13 @@ static int saa5246a_open(struct inode *inode, struct file *file)
776 err = -EIO; 780 err = -EIO;
777 goto fail; 781 goto fail;
778 } 782 }
783 unlock_kernel();
779 784
780 return 0; 785 return 0;
781 786
782fail: 787fail:
783 video_exclusive_release(inode,file); 788 video_exclusive_release(inode,file);
789 unlock_kernel();
784 return err; 790 return err;
785} 791}
786 792