From: Marek Szyprowski Date: Fri, 10 Jun 2011 11:58:42 +0000 (-0300) Subject: [media] media: vb2: reset queued_count value during queue reinitialization X-Git-Tag: 2.1b_release~3466^2~41 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=afdea8bac5e80362459940e18e705d792e677a57;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git [media] media: vb2: reset queued_count value during queue reinitialization queued_count variable was left untouched during the queue reinitialization in __vb2_queue_cancel, what might lead to mismatch between the real number of queued buffers and queued_count variable. Reported-by: Uwe Kleine-König Signed-off-by: Marek Szyprowski CC: Pawel Osciak Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c index 6489aa2..84f03b2 100644 --- a/drivers/media/video/videobuf2-core.c +++ b/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); /*