---

yaml --- r: 254631 b: refs/heads/master c: afdea8b h: refs/heads/master i: 254629: 3c601ab 254627: 325a063 254623: fd6be95 v: v3
git-mirror · Jul 1, 2011 · 32d79fb · 32d79fb
1 parent 2689668
commit 32d79fb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf7b73efb7f52abf56b512546c3bbc35001dd696
+refs/heads/master: afdea8bac5e80362459940e18e705d792e677a57
diff --git a/trunk/drivers/media/video/videobuf2-core.c b/trunk/drivers/media/video/videobuf2-core.c
@@ -1189,6 +1189,7 @@ static void __vb2_queue_cancel(struct vb2_queue *q)
 	 * has not already dequeued before initiating cancel.
 	 */
 	INIT_LIST_HEAD(&q->done_list);
+	atomic_set(&q->queued_count, 0);
 	wake_up_all(&q->done_wq);
 
 	/*