diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-30 13:43:36 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-30 13:43:36 +0200 |
| commit | c8b5c505811fd4797e0ea35bcc60478d626a0971 (patch) | |
| tree | 628f97e562257d3dc6c18269b3a520c45873de7d /linux/drivers/media/video/stk-webcam.c | |
| parent | 4381ceef6895b12019f4d55a6f5ff9629194b259 (diff) | |
| download | mediapointer-dvb-s2-c8b5c505811fd4797e0ea35bcc60478d626a0971.tar.gz mediapointer-dvb-s2-c8b5c505811fd4797e0ea35bcc60478d626a0971.tar.bz2 | |
v4l: move BKL down to the driver level.
From: Hans Verkuil <hverkuil@xs4all.nl>
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>
Diffstat (limited to 'linux/drivers/media/video/stk-webcam.c')
| -rw-r--r-- | linux/drivers/media/video/stk-webcam.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/video/stk-webcam.c b/linux/drivers/media/video/stk-webcam.c index e18745a67..c6660b363 100644 --- a/linux/drivers/media/video/stk-webcam.c +++ b/linux/drivers/media/video/stk-webcam.c @@ -690,11 +690,15 @@ static int v4l_stk_open(struct inode *inode, struct file *fp) vdev = video_devdata(fp); dev = vdev_to_camera(vdev); - if (dev == NULL || !is_present(dev)) + lock_kernel(); + if (dev == NULL || !is_present(dev)) { + unlock_kernel(); return -ENXIO; + } fp->private_data = vdev; kref_get(&dev->kref); usb_autopm_get_interface(dev->interface); + unlock_kernel(); return 0; } |