From bded38d8b784c901da76c4557d36c7aff6549978 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 6 Jun 2012 02:17:16 -0300 Subject: [PATCH] --- yaml --- r: 311259 b: refs/heads/master c: d9762df4a9d0e412b6676a96135323d6924406b8 h: refs/heads/master i: 311257: 54958abb18fc46bb35263c901a4aa31fd8b3a0c7 311255: 064e5d06bed599c8113fc0163495837377f3c0ce v: v3 --- [refs] | 2 +- trunk/drivers/media/video/vivi.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4d58860577a4..5cf80da1416e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af03891f61d7b69eebc79d07bf580faaa9636fbc +refs/heads/master: d9762df4a9d0e412b6676a96135323d6924406b8 diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c index 0960d7f0d394..08c10240e70f 100644 --- a/trunk/drivers/media/video/vivi.c +++ b/trunk/drivers/media/video/vivi.c @@ -1149,10 +1149,14 @@ static ssize_t vivi_read(struct file *file, char __user *data, size_t count, loff_t *ppos) { struct vivi_dev *dev = video_drvdata(file); + int err; dprintk(dev, 1, "read called\n"); - return vb2_read(&dev->vb_vidq, data, count, ppos, + mutex_lock(&dev->mutex); + err = vb2_read(&dev->vb_vidq, data, count, ppos, file->f_flags & O_NONBLOCK); + mutex_unlock(&dev->mutex); + return err; } static unsigned int