diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-03-06 23:28:49 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-03-06 23:28:49 +0100 |
| commit | 63b26bd07ef0358953838de8df7f77856336a769 (patch) | |
| tree | 7179c5f41b6cd2189be87df0188cb0bfff8acf80 /linux/drivers/media/video/ivtv/ivtv-fileops.c | |
| parent | 3d93e47b381c2726960239773bcd2b161a1143b9 (diff) | |
| download | mediapointer-dvb-s2-63b26bd07ef0358953838de8df7f77856336a769.tar.gz mediapointer-dvb-s2-63b26bd07ef0358953838de8df7f77856336a769.tar.bz2 | |
ivtv: fix polling bug
From: Hans Verkuil <hverkuil@xs4all.nl>
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>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-fileops.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-fileops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-fileops.c b/linux/drivers/media/video/ivtv/ivtv-fileops.c index 6fb96f19a..d949a8133 100644 --- a/linux/drivers/media/video/ivtv/ivtv-fileops.c +++ b/linux/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; } |