Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=40558dafff257d69248af8b96c7e896f6bc79dfa
Commit: 40558dafff257d69248af8b96c7e896f6bc79dfa
Parent: ba366a23b68029fc8560acf1ad8735eed910f962
Author: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
AuthorDate: Mon Aug 27 07:37:34 2007 -0300
Committer: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 00:02:49 2007 -0300
V4L/DVB (6259): Fix vivi poll() method
Due to the replace of videobuf_read_one to videobuf_read_stream, poll()
method implementation is wrong. This fixes poll() implementation, making
read of /dev/video? to work again.
With this method, an USB driver can use video-buf, without needing to
request memory from the DMA-safe area.
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
drivers/media/video/vivi.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index c14e2b3..01c9776 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -1122,9 +1122,8 @@ vivi_poll(struct file *file, struct poll_table_struct
*wait)
} else {
dprintk(1,"poll: read() interface\n");
/* read() capture */
- buf = (struct vivi_buffer*)fh->vb_vidq.read_buf;
- if (NULL == buf)
- return POLLERR;
+ return videobuf_poll_stream(file, &fh-> vb_vidq,
+ wait);
}
poll_wait(file, &buf->vb.done, wait);
if (buf->vb.state == STATE_DONE ||
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
