summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/vivi.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/vivi.c')
-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 aa91f1a9a..fe872e253 100644
--- a/linux/drivers/media/video/vivi.c
+++ b/linux/drivers/media/video/vivi.c
@@ -1225,9 +1225,14 @@ vivi_poll(struct file *file, struct poll_table_struct *wait)
} else {
dprintk(1,"poll: read() interface\n");
/* read() capture */
+#if 0
buf = (struct vivi_buffer*)fh->vb_vidq.read_buf;
if (NULL == buf)
return POLLERR;
+#else
+ return videobuf_poll_stream(file, &fh-> vb_vidq,
+ wait);
+#endif
}
poll_wait(file, &buf->vb.done, wait);
if (buf->vb.state == STATE_DONE ||