From 69d50a9b5440f0921a1a93b4e12655b4727fd2c8 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 30 Jan 2013 13:29:02 -0300 Subject: [PATCH] --- yaml --- r: 357454 b: refs/heads/master c: cd13823f5db3e66552801c04f0e761408ef17eb0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/v4l2-core/videobuf2-core.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3b5f8565487d..51e58e542bb0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 971dfc678114d61c07bd6f8ff8380558b6e12d5d +refs/heads/master: cd13823f5db3e66552801c04f0e761408ef17eb0 diff --git a/trunk/drivers/media/v4l2-core/videobuf2-core.c b/trunk/drivers/media/v4l2-core/videobuf2-core.c index d09be38dd377..db1235dcb328 100644 --- a/trunk/drivers/media/v4l2-core/videobuf2-core.c +++ b/trunk/drivers/media/v4l2-core/videobuf2-core.c @@ -1965,6 +1965,11 @@ unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait) poll_wait(file, &fh->wait, wait); } + if (!V4L2_TYPE_IS_OUTPUT(q->type) && !(req_events & (POLLIN | POLLRDNORM))) + return res; + if (V4L2_TYPE_IS_OUTPUT(q->type) && !(req_events & (POLLOUT | POLLWRNORM))) + return res; + /* * Start file I/O emulator only if streaming API has not been used yet. */