---

yaml --- r: 311259 b: refs/heads/master c: d9762df h: refs/heads/master i: 311257: 54958ab 311255: 064e5d0 v: v3
git-mirror · Jun 11, 2012 · bded38d · bded38d
1 parent c9df3a3
commit bded38d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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