|
@@ -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) {
|
|
|
|
- unlock_kernel();
|
|
|
|
|
|
+ if (cam == NULL)
|
|
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)
|
|
}
|
|
}
|
|
(cam->users)++;
|
|
(cam->users)++;
|
|
mutex_unlock(&cam->s_mutex);
|
|
mutex_unlock(&cam->s_mutex);
|
|
- unlock_kernel();
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|