diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-04-28 11:18:00 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-29 23:22:13 -0400 |
commit | 16928be301b0881f7b7afcf95e0ee7dc3214de8d (patch) | |
tree | 52e733f4404e3c73800f3e7a338538e6030715cc /drivers/media/video/ivtv/ivtv-fileops.c | |
parent | ff138171ec6f84f311fe8c0395ad7f9e6d04feec (diff) |
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/media/video/ivtv/ivtv-fileops.c')
-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) | |||
755 | IVTV_DEBUG_HI_FILE("Encoder poll\n"); | 755 | IVTV_DEBUG_HI_FILE("Encoder poll\n"); |
756 | poll_wait(filp, &s->waitq, wait); | 756 | poll_wait(filp, &s->waitq, wait); |
757 | 757 | ||
758 | if (eof || s->q_full.length || s->q_io.length) | 758 | if (s->q_full.length || s->q_io.length) |
759 | return POLLIN | POLLRDNORM; | 759 | return POLLIN | POLLRDNORM; |
760 | if (eof) | ||
761 | return POLLHUP; | ||
760 | return 0; | 762 | return 0; |
761 | } | 763 | } |
762 | 764 | ||