diff options
Diffstat (limited to 'drivers/media/video/vivi.c')
-rw-r--r-- | drivers/media/video/vivi.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 0960d7f0d394..08c10240e70f 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c | |||
@@ -1149,10 +1149,14 @@ static ssize_t | |||
1149 | vivi_read(struct file *file, char __user *data, size_t count, loff_t *ppos) | 1149 | vivi_read(struct file *file, char __user *data, size_t count, loff_t *ppos) |
1150 | { | 1150 | { |
1151 | struct vivi_dev *dev = video_drvdata(file); | 1151 | struct vivi_dev *dev = video_drvdata(file); |
1152 | int err; | ||
1152 | 1153 | ||
1153 | dprintk(dev, 1, "read called\n"); | 1154 | dprintk(dev, 1, "read called\n"); |
1154 | return vb2_read(&dev->vb_vidq, data, count, ppos, | 1155 | mutex_lock(&dev->mutex); |
1156 | err = vb2_read(&dev->vb_vidq, data, count, ppos, | ||
1155 | file->f_flags & O_NONBLOCK); | 1157 | file->f_flags & O_NONBLOCK); |
1158 | mutex_unlock(&dev->mutex); | ||
1159 | return err; | ||
1156 | } | 1160 | } |
1157 | 1161 | ||
1158 | static unsigned int | 1162 | static unsigned int |