diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-10 10:54:45 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-10 10:54:45 -0300 |
| commit | 18af961f48808a7aaad697abc64a3c6ee405aef1 (patch) | |
| tree | b99a667eb2f101bdb94e7ea91517cb0575019550 /linux/drivers/media/video/ivtv/ivtv-fileops.c | |
| parent | a995217ac193b3af9f75eaaece38717034e42583 (diff) | |
| parent | 8a9152967f3467949c4a6ec02ef9623be9f396fb (diff) | |
| download | mediapointer-dvb-s2-18af961f48808a7aaad697abc64a3c6ee405aef1.tar.gz mediapointer-dvb-s2-18af961f48808a7aaad697abc64a3c6ee405aef1.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
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; } |