From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Tue, 22 Apr 2008 17:45:48 +0000 (-0300)
Subject: V4L/DVB (7337): ivtv: fix polling bug
X-Git-Tag: v2.6.26-rc1~1084^2~334
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0358d7c580370c5eaf081ac42a41c6e347709051;p=platform%2Fkernel%2Flinux-exynos.git

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>
---

diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index 6fb96f1..d949a81 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;
 }