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/cafe_ccic.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/cafe_ccic.c')
-rw-r--r-- | drivers/media/video/cafe_ccic.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index 5405c30dbb0..e9994c81df6 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c | |||
@@ -1476,9 +1476,12 @@ static int cafe_v4l_open(struct inode *inode, struct file *filp) | |||
1476 | { | 1476 | { |
1477 | struct cafe_camera *cam; | 1477 | struct cafe_camera *cam; |
1478 | 1478 | ||
1479 | lock_kernel(); | ||
1479 | cam = cafe_find_dev(iminor(inode)); | 1480 | cam = cafe_find_dev(iminor(inode)); |
1480 | if (cam == NULL) | 1481 | if (cam == NULL) { |
1482 | unlock_kernel(); | ||
1481 | return -ENODEV; | 1483 | return -ENODEV; |
1484 | } | ||
1482 | filp->private_data = cam; | 1485 | filp->private_data = cam; |
1483 | 1486 | ||
1484 | mutex_lock(&cam->s_mutex); | 1487 | mutex_lock(&cam->s_mutex); |
@@ -1490,6 +1493,7 @@ static int cafe_v4l_open(struct inode *inode, struct file *filp) | |||
1490 | } | 1493 | } |
1491 | (cam->users)++; | 1494 | (cam->users)++; |
1492 | mutex_unlock(&cam->s_mutex); | 1495 | mutex_unlock(&cam->s_mutex); |
1496 | unlock_kernel(); | ||
1493 | return 0; | 1497 | return 0; |
1494 | } | 1498 | } |
1495 | 1499 | ||