diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2007-08-27 07:55:38 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2007-08-27 07:55:38 -0300 |
| commit | 91ca953d196882ae26470d29decfd7356151226c (patch) | |
| tree | b68329addd1c6bfae6f38ad9a1dfcf6a20bfbcaf | |
| parent | 57be11d238dbbb48e94a010c01eef6282832e752 (diff) | |
| download | mediapointer-dvb-s2-91ca953d196882ae26470d29decfd7356151226c.tar.gz mediapointer-dvb-s2-91ca953d196882ae26470d29decfd7356151226c.tar.bz2 | |
tm6000: fix poll() method
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | linux/drivers/staging/tm6000/tm6000-video.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linux/drivers/staging/tm6000/tm6000-video.c b/linux/drivers/staging/tm6000/tm6000-video.c index e651f80e7..5b440180b 100644 --- a/linux/drivers/staging/tm6000/tm6000-video.c +++ b/linux/drivers/staging/tm6000/tm6000-video.c @@ -1510,9 +1510,14 @@ tm6000_poll(struct file *file, struct poll_table_struct *wait) buf = list_entry(fh->vb_vidq.stream.next,struct tm6000_buffer,vb.stream); } else { /* read() capture */ +#if 0 buf = (struct tm6000_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 || |