Commit 74084d33 authored by Jonathan Corbet's avatar Jonathan Corbet Committed by Mauro Carvalho Chehab

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

Remove lock_kernel() call from cafe_ccic.c

Commit d56dc612 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: default avatarJonathan Corbet <corbet@lwn.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent c7f09db6
...@@ -1476,12 +1476,9 @@ static int cafe_v4l_open(struct inode *inode, struct file *filp) ...@@ -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) ...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment