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/stradis.c | |
| parent | 95f73c5b57990c97047c200b8746ab62a360c5bc (diff) | |
| download | op-kernel-dev-d56dc61265d2527a63ab5b0f03199a43cd89ca36.zip op-kernel-dev-d56dc61265d2527a63ab5b0f03199a43cd89ca36.tar.gz | |
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 276bded..a3cbe9b 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) struct video_device *vdev = video_devdata(file); struct saa7146 *saa = container_of(vdev, struct saa7146, video_dev); + lock_kernel(); file->private_data = saa; saa->user++; - if (saa->user > 1) + if (saa->user > 1) { + unlock_kernel(); return 0; /* device open already, don't reset */ + } saa->writemode = VID_WRITE_MPEG_VID; /* default to video */ + unlock_kernel(); return 0; } |
