lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (9355): de-BKL cafe_ccic.c

Browse Source 
Remove lock_kernel() call from cafe_ccic.c

Commit d56dc61265 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>
This commit is contained in:
Jonathan Corbet
2008-10-17 20:19:29 -03:00
committed by Mauro Carvalho Chehab
parent c7f09db685
commit 74084d33cb
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/video/cafe_ccic.c
View File

@@ -1476,12 +1476,9 @@ static int cafe_v4l_open(struct inode *inode, struct file *filp)
{ {
struct cafe_camera *cam; struct cafe_camera *cam;
lock_kernel();
cam = cafe_find_dev(iminor(inode)); cam = cafe_find_dev(iminor(inode));
if (cam == NULL) { if (cam == NULL)
unlock_kernel();
return -ENODEV; return -ENODEV;
}
filp->private_data = cam; filp->private_data = cam;
mutex_lock(&cam->s_mutex); mutex_lock(&cam->s_mutex);
@@ -1493,7 +1490,6 @@ static int cafe_v4l_open(struct inode *inode, struct file *filp)
} }
(cam->users)++; (cam->users)++;
mutex_unlock(&cam->s_mutex); mutex_unlock(&cam->s_mutex);
unlock_kernel();
return 0; return 0;
} }