diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2008-10-17 20:19:29 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-11 08:11:20 -0200 |
| commit | 74084d33cb6221a5836a2a4438ec1bcf7a0797b0 (patch) | |
| tree | fb5ecd7ad40b0619bd90358ad72fcf3f42ae4d05 /drivers/media | |
| parent | c7f09db6852d85e7f76322815051aad1c88d08cf (diff) | |
| download | talos-obmc-linux-74084d33cb6221a5836a2a4438ec1bcf7a0797b0.tar.gz talos-obmc-linux-74084d33cb6221a5836a2a4438ec1bcf7a0797b0.zip | |
V4L/DVB (9355): de-BKL cafe_ccic.c
Remove lock_kernel() call from cafe_ccic.c
Commit d56dc61265d2527a63ab5b0f03199a43cd89ca36 added lock_kernel()
calls to cafe_ccic.c. But that driver was written with proper locking
and does not need the BKL, so take it back out.
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/cafe_ccic.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index a8c068e1de1c..1740b9ebdcef 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c @@ -1476,12 +1476,9 @@ static int cafe_v4l_open(struct inode *inode, struct file *filp) { struct cafe_camera *cam; - lock_kernel(); cam = cafe_find_dev(iminor(inode)); - if (cam == NULL) { - unlock_kernel(); + if (cam == NULL) return -ENODEV; - } filp->private_data = cam; mutex_lock(&cam->s_mutex); @@ -1493,7 +1490,6 @@ static int cafe_v4l_open(struct inode *inode, struct file *filp) } (cam->users)++; mutex_unlock(&cam->s_mutex); - unlock_kernel(); return 0; } |
