---

yaml --- r: 377182 b: refs/heads/master c: 412cb87 h: refs/heads/master v: v3
git-mirror · Jun 3, 2013 · 1fb8459 · 1fb8459
1 parent 609d6b4
commit 1fb8459
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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.