diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-04-22 19:45:48 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 19:07:49 +0200 |
| commit | 0358d7c580370c5eaf081ac42a41c6e347709051 (patch) | |
| tree | 481beb1b4f99d7bf74d1b3d7a3b08fc931722d3a /drivers/media/video/ivtv | |
| parent | V4L/DVB (7336): soc-camera: streamline hardware parameter negotiation (diff) | |
| download | linux-0358d7c580370c5eaf081ac42a41c6e347709051.tar.xz linux-0358d7c580370c5eaf081ac42a41c6e347709051.zip | |
V4L/DVB (7337): ivtv: fix polling bug
The q_io queue was never taken into account by the poll function. Thanks to
Andy Walls for finding this bug.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/ivtv')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-fileops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c index 6fb96f19a866..d949a81339d5 100644 --- a/drivers/media/video/ivtv/ivtv-fileops.c +++ b/drivers/media/video/ivtv/ivtv-fileops.c @@ -753,7 +753,7 @@ unsigned int ivtv_v4l2_enc_poll(struct file *filp, poll_table * wait) IVTV_DEBUG_HI_FILE("Encoder poll\n"); poll_wait(filp, &s->waitq, wait); - if (eof || s->q_full.length) + if (eof || s->q_full.length || s->q_io.length) return POLLIN | POLLRDNORM; return 0; } |