diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-27 06:37:34 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-09 23:02:49 -0400 |
| commit | 40558dafff257d69248af8b96c7e896f6bc79dfa (patch) | |
| tree | a99e886611d3b672a09bfc2619391055fec7c6df /drivers/media | |
| parent | ba366a23b68029fc8560acf1ad8735eed910f962 (diff) | |
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 <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | 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 c14e2b3e4241..01c977671311 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) | |||
| 1122 | } else { | 1122 | } else { |
| 1123 | dprintk(1,"poll: read() interface\n"); | 1123 | dprintk(1,"poll: read() interface\n"); |
| 1124 | /* read() capture */ | 1124 | /* read() capture */ |
| 1125 | buf = (struct vivi_buffer*)fh->vb_vidq.read_buf; | 1125 | return videobuf_poll_stream(file, &fh-> vb_vidq, |
| 1126 | if (NULL == buf) | 1126 | wait); |
| 1127 | return POLLERR; | ||
| 1128 | } | 1127 | } |
| 1129 | poll_wait(file, &buf->vb.done, wait); | 1128 | poll_wait(file, &buf->vb.done, wait); |
| 1130 | if (buf->vb.state == STATE_DONE || | 1129 | if (buf->vb.state == STATE_DONE || |