aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/vivi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/vivi.c')
-rw-r--r--drivers/media/video/vivi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index f6d3a9460ccc..c10169e35753 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -1123,7 +1123,7 @@ vivi_read(struct file *file, char __user *data, size_t count, loff_t *ppos)
1123 if (fh->type==V4L2_BUF_TYPE_VIDEO_CAPTURE) { 1123 if (fh->type==V4L2_BUF_TYPE_VIDEO_CAPTURE) {
1124 if (res_locked(fh->dev)) 1124 if (res_locked(fh->dev))
1125 return -EBUSY; 1125 return -EBUSY;
1126 return videobuf_read_one(&fh->vb_vidq, data, count, ppos, 1126 return videobuf_read_stream(&fh->vb_vidq, data, count, ppos, 0,
1127 file->f_flags & O_NONBLOCK); 1127 file->f_flags & O_NONBLOCK);
1128 } 1128 }
1129 return 0; 1129 return 0;