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/usbvision | |
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/usbvision')
-rw-r--r-- | drivers/media/video/usbvision/usbvision-video.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c index b977116a0dd9..b76295a5be8b 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/video/usbvision/usbvision-video.c | |||
@@ -367,6 +367,7 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file) | |||
367 | 367 | ||
368 | PDEBUG(DBG_IO, "open"); | 368 | PDEBUG(DBG_IO, "open"); |
369 | 369 | ||
370 | lock_kernel(); | ||
370 | usbvision_reset_powerOffTimer(usbvision); | 371 | usbvision_reset_powerOffTimer(usbvision); |
371 | 372 | ||
372 | if (usbvision->user) | 373 | if (usbvision->user) |
@@ -424,6 +425,7 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file) | |||
424 | usbvision_empty_framequeues(usbvision); | 425 | usbvision_empty_framequeues(usbvision); |
425 | 426 | ||
426 | PDEBUG(DBG_IO, "success"); | 427 | PDEBUG(DBG_IO, "success"); |
428 | unlock_kernel(); | ||
427 | return errCode; | 429 | return errCode; |
428 | } | 430 | } |
429 | 431 | ||