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/stk-webcam.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/stk-webcam.c')
-rw-r--r-- | drivers/media/video/stk-webcam.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c index ad36af30e099..6b1ef5dc562c 100644 --- a/drivers/media/video/stk-webcam.c +++ b/drivers/media/video/stk-webcam.c | |||
@@ -689,11 +689,15 @@ static int v4l_stk_open(struct inode *inode, struct file *fp) | |||
689 | vdev = video_devdata(fp); | 689 | vdev = video_devdata(fp); |
690 | dev = vdev_to_camera(vdev); | 690 | dev = vdev_to_camera(vdev); |
691 | 691 | ||
692 | if (dev == NULL || !is_present(dev)) | 692 | lock_kernel(); |
693 | if (dev == NULL || !is_present(dev)) { | ||
694 | unlock_kernel(); | ||
693 | return -ENXIO; | 695 | return -ENXIO; |
696 | } | ||
694 | fp->private_data = vdev; | 697 | fp->private_data = vdev; |
695 | kref_get(&dev->kref); | 698 | kref_get(&dev->kref); |
696 | usb_autopm_get_interface(dev->interface); | 699 | usb_autopm_get_interface(dev->interface); |
700 | unlock_kernel(); | ||
697 | 701 | ||
698 | return 0; | 702 | return 0; |
699 | } | 703 | } |