Merge branch 'linux-2.6' into next

1 files changed, 1 insertions, 5 deletions

diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index a8c068e1de1c..1740b9ebdcef 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -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;
 }