summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-07-29 22:56:11 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-07-29 22:56:11 -0300
commit6198749e01385bc3e99d7447d5e8b5ddd36bb18e (patch)
treed4e40c1df58475864d65fe446233f4c9835288b0
parent6ced02a5fd04c06f95dc3b445f994315ebcd88fd (diff)
downloadmediapointer-dvb-s2-6198749e01385bc3e99d7447d5e8b5ddd36bb18e.tar.gz
mediapointer-dvb-s2-6198749e01385bc3e99d7447d5e8b5ddd36bb18e.tar.bz2
videobuf_read_stream is more efficient than videobuf_read_one
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--linux/drivers/media/video/vivi.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/linux/drivers/media/video/vivi.c b/linux/drivers/media/video/vivi.c
index 19153e452..e0504babe 100644
--- a/linux/drivers/media/video/vivi.c
+++ b/linux/drivers/media/video/vivi.c
@@ -1378,8 +1378,13 @@ 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;
+#if 0
return videobuf_read_one(&fh->vb_vidq, data, count, ppos,
file->f_flags & O_NONBLOCK);
+#else
+ return videobuf_read_stream(&fh->vb_vidq, data, count, ppos, 0,
+ file->f_flags & O_NONBLOCK);
+#endif
}
return 0;
}