Skip to content

Commit

Permalink
V4L/DVB (9355): de-BKL cafe_ccic.c
Browse files Browse the repository at this point in the history
Remove lock_kernel() call from cafe_ccic.c

Commit d56dc61 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>
  • Loading branch information
Jonathan Corbet authored and Mauro Carvalho Chehab committed Nov 11, 2008
1 parent c7f09db commit 74084d3
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions drivers/media/video/cafe_ccic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
}

Expand Down

0 comments on commit 74084d3

Please sign in to comment.