From dbf07c5aee8a6e2ab384597d319af1b60686a530 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 13 Jul 2011 04:03:52 -0300 Subject: [PATCH] --- yaml --- r: 306085 b: refs/heads/master c: 0e17e9a9f6bfedb6aefcd88632f5d6d17c871176 h: refs/heads/master i: 306083: 66a237c2b621ff9b008be6cfdf806ef79b4c5543 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videobuf-core.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 021d59b04765..904c9b493641 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf5c7cbb996d6af51f8cc18a30ffa426196bf840 +refs/heads/master: 0e17e9a9f6bfedb6aefcd88632f5d6d17c871176 diff --git a/trunk/drivers/media/video/videobuf-core.c b/trunk/drivers/media/video/videobuf-core.c index de4fa4eb8844..ffdf59cfe405 100644 --- a/trunk/drivers/media/video/videobuf-core.c +++ b/trunk/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) {