diff --git a/[refs] b/[refs]
index e78fc08f3e87..a2ec7305cf1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9f668dd12d3ed293af0d466bcaa393b78a7d0ee
+refs/heads/master: acb09af4e333dc92cdd32ae75ee7e5f3d7aaf60b
diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c
index f6d3a9460ccc..c10169e35753 100644
--- a/trunk/drivers/media/video/vivi.c
+++ b/trunk/drivers/media/video/vivi.c
@@ -1123,7 +1123,7 @@ vivi_read(struct file *file, char __user *data, size_t count, loff_t *ppos)
 	if (fh->type==V4L2_BUF_TYPE_VIDEO_CAPTURE) {
 		if (res_locked(fh->dev))
 			return -EBUSY;
-		return videobuf_read_one(&fh->vb_vidq, data, count, ppos,
+		return videobuf_read_stream(&fh->vb_vidq, data, count, ppos, 0,
 					file->f_flags & O_NONBLOCK);
 	}
 	return 0;