mirror of
https://github.com/torvalds/linux.git
synced 2024-11-12 15:11:50 +00:00
V4L/DVB (9355): de-BKL cafe_ccic.c
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:
parent
c7f09db685
commit
74084d33cb
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user