diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-04-28 17:18:00 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-30 05:22:13 +0200 |
| commit | 16928be301b0881f7b7afcf95e0ee7dc3214de8d (patch) | |
| tree | 52e733f4404e3c73800f3e7a338538e6030715cc /drivers | |
| parent | V4L/DVB (7789b): Fix merge conflicts (diff) | |
| download | linux-16928be301b0881f7b7afcf95e0ee7dc3214de8d.tar.xz linux-16928be301b0881f7b7afcf95e0ee7dc3214de8d.zip | |
V4L/DVB (7791): ivtv: POLLHUP must be returned on eof
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-fileops.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c index a7640c49f1d8..2b74b0ab1477 100644 --- a/drivers/media/video/ivtv/ivtv-fileops.c +++ b/drivers/media/video/ivtv/ivtv-fileops.c @@ -755,8 +755,10 @@ 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 || s->q_io.length) + if (s->q_full.length || s->q_io.length) return POLLIN | POLLRDNORM; + if (eof) + return POLLHUP; return 0; } |