diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-30 07:43:36 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 07:36:47 -0400 |
commit | d56dc61265d2527a63ab5b0f03199a43cd89ca36 (patch) | |
tree | bea2a5b12fc120ca6e8797b2f16ad9696e0f25dd /drivers/media/video/stradis.c | |
parent | 95f73c5b57990c97047c200b8746ab62a360c5bc (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/stradis.c')
-rw-r--r-- | drivers/media/video/stradis.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c index 276bded06ab3..a3cbe9be3c15 100644 --- a/drivers/media/video/stradis.c +++ b/drivers/media/video/stradis.c | |||
@@ -1882,12 +1882,16 @@ static int saa_open(struct inode *inode, struct file *file) | |||
1882 | struct video_device *vdev = video_devdata(file); | 1882 | struct video_device *vdev = video_devdata(file); |
1883 | struct saa7146 *saa = container_of(vdev, struct saa7146, video_dev); | 1883 | struct saa7146 *saa = container_of(vdev, struct saa7146, video_dev); |
1884 | 1884 | ||
1885 | lock_kernel(); | ||
1885 | file->private_data = saa; | 1886 | file->private_data = saa; |
1886 | 1887 | ||
1887 | saa->user++; | 1888 | saa->user++; |
1888 | if (saa->user > 1) | 1889 | if (saa->user > 1) { |
1890 | unlock_kernel(); | ||
1889 | return 0; /* device open already, don't reset */ | 1891 | return 0; /* device open already, don't reset */ |
1892 | } | ||
1890 | saa->writemode = VID_WRITE_MPEG_VID; /* default to video */ | 1893 | saa->writemode = VID_WRITE_MPEG_VID; /* default to video */ |
1894 | unlock_kernel(); | ||
1891 | return 0; | 1895 | return 0; |
1892 | } | 1896 | } |
1893 | 1897 | ||