From 32d79fb4de83cb72ceac487d3b2080cab1a0da2a Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Fri, 10 Jun 2011 08:58:42 -0300 Subject: [PATCH] --- yaml --- r: 254631 b: refs/heads/master c: afdea8bac5e80362459940e18e705d792e677a57 h: refs/heads/master i: 254629: 3c601ab29e161c8ef23f4a1bf2211de7ca29b37a 254627: 325a063830310d23c905b39a7a633695b6fa5e33 254623: fd6be95377707fab32e0c64d9d63c90d09e6716a v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videobuf2-core.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7511e5856b7f..1ecd1efbd967 100644 --- 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 index 6489aa26e788..84f03b25aedb 100644 --- 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); /*