diff options
| author | Mauro Carvalho Chehab | 2007-07-30 03:56:11 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2007-10-10 03:05:10 +0200 |
| commit | acb09af4e333dc92cdd32ae75ee7e5f3d7aaf60b (patch) | |
| tree | a2d472a986de92cfd93faef6662abf95c40321b3 /drivers/media/video/vivi.c | |
| parent | V4L/DVB (6010): Use inline functions instead of inline asm for powerpc (diff) | |
| download | kernel-qcow2-linux-acb09af4e333dc92cdd32ae75ee7e5f3d7aaf60b.tar.gz kernel-qcow2-linux-acb09af4e333dc92cdd32ae75ee7e5f3d7aaf60b.tar.xz kernel-qcow2-linux-acb09af4e333dc92cdd32ae75ee7e5f3d7aaf60b.zip | |
V4L/DVB (6014): vivi: use videobuf_read_stream()
videobuf_read_stream is more efficient than videobuf_read_one
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/vivi.c')
| -rw-r--r-- | drivers/media/video/vivi.c | 2 |
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) 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; |