diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-10-25 10:07:57 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-10-25 10:07:57 +0200 |
| commit | 6b2362e63b011d40167d2ec6365668c2966643e9 (patch) | |
| tree | b86173981b8298c08dc9afd6b24a9cb66ac95e81 /linux/drivers/media/video/cafe_ccic.c | |
| parent | 9487678147d617a72de2c003e5b9861235c9c0fb (diff) | |
| parent | f46b85426d01f8ce77fd9a4a036cc0345ae1c4be (diff) | |
| download | mediapointer-dvb-s2-6b2362e63b011d40167d2ec6365668c2966643e9.tar.gz mediapointer-dvb-s2-6b2362e63b011d40167d2ec6365668c2966643e9.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/cafe_ccic.c')
| -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; } |