Skip to content

Commit

Permalink
V4L/DVB (6259): Fix vivi poll() method
Browse files Browse the repository at this point in the history
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 <mchehab@infradead.org>
  • Loading branch information
Mauro Carvalho Chehab committed Oct 10, 2007
1 parent ba366a2 commit 40558da
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/media/video/vivi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 ||
Expand Down

0 comments on commit 40558da

Please sign in to comment.