diff options
Diffstat (limited to 'drivers/media/video/v4l2-dev.c')
| -rw-r--r-- | drivers/media/video/v4l2-dev.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c index 155fdec9ac7d..6b9f3cb0de98 100644 --- a/drivers/media/video/v4l2-dev.c +++ b/drivers/media/video/v4l2-dev.c | |||
| @@ -116,7 +116,6 @@ static int video_open(struct inode *inode, struct file *file) | |||
| 116 | 116 | ||
| 117 | if (minor >= VIDEO_NUM_DEVICES) | 117 | if (minor >= VIDEO_NUM_DEVICES) |
| 118 | return -ENODEV; | 118 | return -ENODEV; |
| 119 | lock_kernel(); | ||
| 120 | mutex_lock(&videodev_lock); | 119 | mutex_lock(&videodev_lock); |
| 121 | vfl = video_device[minor]; | 120 | vfl = video_device[minor]; |
| 122 | if (vfl == NULL) { | 121 | if (vfl == NULL) { |
| @@ -126,7 +125,6 @@ static int video_open(struct inode *inode, struct file *file) | |||
| 126 | vfl = video_device[minor]; | 125 | vfl = video_device[minor]; |
| 127 | if (vfl == NULL) { | 126 | if (vfl == NULL) { |
| 128 | mutex_unlock(&videodev_lock); | 127 | mutex_unlock(&videodev_lock); |
| 129 | unlock_kernel(); | ||
| 130 | return -ENODEV; | 128 | return -ENODEV; |
| 131 | } | 129 | } |
| 132 | } | 130 | } |
| @@ -140,7 +138,6 @@ static int video_open(struct inode *inode, struct file *file) | |||
| 140 | } | 138 | } |
| 141 | fops_put(old_fops); | 139 | fops_put(old_fops); |
| 142 | mutex_unlock(&videodev_lock); | 140 | mutex_unlock(&videodev_lock); |
| 143 | unlock_kernel(); | ||
| 144 | return err; | 141 | return err; |
| 145 | } | 142 | } |
| 146 | 143 | ||