diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-17 23:19:29 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-17 23:19:29 +0000 |
| commit | 1b6595818b457badf50f6aff79f832360eb499de (patch) | |
| tree | 39854b22906147df34456fabe1601f37f3d58473 /linux/drivers/media/video | |
| parent | ec60228e845ea89c0f4e3e5b2a0d7f3ce832f182 (diff) | |
| download | mediapointer-dvb-s2-1b6595818b457badf50f6aff79f832360eb499de.tar.gz mediapointer-dvb-s2-1b6595818b457badf50f6aff79f832360eb499de.tar.bz2 | |
de-BKL cafe_ccic.c
From: Jonathan Corbet <corbet@lwn.net>
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 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/cafe_ccic.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/linux/drivers/media/video/cafe_ccic.c b/linux/drivers/media/video/cafe_ccic.c index 6aba16f85..1184b9186 100644 --- a/linux/drivers/media/video/cafe_ccic.c +++ b/linux/drivers/media/video/cafe_ccic.c @@ -1483,12 +1483,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); @@ -1500,7 +1497,6 @@ static int cafe_v4l_open(struct inode *inode, struct file *filp) } (cam->users)++; mutex_unlock(&cam->s_mutex); - unlock_kernel(); return 0; } |