From 1fb8459918e6292ee93ee7c1144d8b605a70eb36 Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Mon, 20 May 2013 23:47:29 -0300 Subject: [PATCH] --- yaml --- r: 377182 b: refs/heads/master c: 412cb87d28a1f299ee82fe1c8bfe6cbeec9a4655 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/v4l2-core/videobuf2-core.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d4782b7c7018..5451f660604f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9d98ddc0a4e4e11603c818bf234644031bff384 +refs/heads/master: 412cb87d28a1f299ee82fe1c8bfe6cbeec9a4655 diff --git a/trunk/drivers/media/v4l2-core/videobuf2-core.c b/trunk/drivers/media/v4l2-core/videobuf2-core.c index 7d833eefaf4e..e3bdc3be91e1 100644 --- a/trunk/drivers/media/v4l2-core/videobuf2-core.c +++ b/trunk/drivers/media/v4l2-core/videobuf2-core.c @@ -2014,7 +2014,8 @@ unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait) if (list_empty(&q->queued_list)) return res | POLLERR; - poll_wait(file, &q->done_wq, wait); + if (list_empty(&q->done_list)) + poll_wait(file, &q->done_wq, wait); /* * Take first buffer available for dequeuing.