summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2011-06-10 15:58:42 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-01 05:32:58 +0400
commitafdea8bac5e80362459940e18e705d792e677a57 (patch)
treed51d08685cb146d0958daa5c951f7940759b093c /drivers/media
parentbf7b73efb7f52abf56b512546c3bbc35001dd696 (diff)
downloadlinux-afdea8bac5e80362459940e18e705d792e677a57.tar.xz
[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 <u.kleine-koenig@pengutronix.de> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> CC: Pawel Osciak <pawel@osciak.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/videobuf2-core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c
index 6489aa26e788..84f03b25aedb 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);
/*