diff options
| author |   Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-30 08:43:36 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 09:36:47 -0200 |
| commit | d56dc61265d2527a63ab5b0f03199a43cd89ca36 (patch) | |
| tree | bea2a5b12fc120ca6e8797b2f16ad9696e0f25dd /drivers/media/video/saa5246a.c | |
| parent | V4L/DVB (8561): make ivtv_claim_stream() static (diff) | |
| download | linux-dev-d56dc61265d2527a63ab5b0f03199a43cd89ca36.tar.xz linux-dev-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/saa5246a.c')
| -rw-r--r-- | drivers/media/video/saa5246a.c | 8 |
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 @@ #include <linux/init.h> #include <linux/i2c.h> #include <linux/videotext.h> +#include <linux/smp_lock.h> #include <linux/videodev.h> #include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> @@ -737,9 +738,12 @@ static int saa5246a_open(struct inode *inode, struct file *file) struct saa5246a_device *t = vd->priv; int err; + lock_kernel(); err = video_exclusive_open(inode,file); - if (err < 0) + if (err < 0) { + unlock_kernel(); return err; + } if (t->client==NULL) { err = -ENODEV; @@ -776,11 +780,13 @@ static int saa5246a_open(struct inode *inode, struct file *file) err = -EIO; goto fail; } + unlock_kernel(); return 0; fail: video_exclusive_release(inode,file); + unlock_kernel(); return err; } |