From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Wed, 13 Jul 2011 09:03:52 +0000 (+0200)
Subject: videobuf: only start streaming in poll() if so requested by the poll mask.
X-Git-Tag: next-20111110~39^2^2~9
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c18f17c24f8eaf3eaae67f0f7e24de6dbe523aa3;p=karo-tx-linux.git

videobuf: only start streaming in poll() if so requested by the poll mask.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c
index de4fa4eb8844..ffdf59cfe405 100644
--- a/drivers/media/video/videobuf-core.c
+++ b/drivers/media/video/videobuf-core.c
@@ -1129,6 +1129,7 @@ unsigned int videobuf_poll_stream(struct file *file,
 				  struct videobuf_queue *q,
 				  poll_table *wait)
 {
+	unsigned long req_events = poll_requested_events(wait);
 	struct videobuf_buffer *buf = NULL;
 	unsigned int rc = 0;
 
@@ -1137,7 +1138,7 @@ unsigned int videobuf_poll_stream(struct file *file,
 		if (!list_empty(&q->stream))
 			buf = list_entry(q->stream.next,
 					 struct videobuf_buffer, stream);
-	} else {
+	} else if (req_events & (POLLIN | POLLRDNORM)) {
 		if (!q->reading)
 			__videobuf_read_start(q);
 		if (!q->reading) {