| Message ID | 1307707479-16189-1-git-send-email-m.szyprowski@samsung.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, Jun 10, 2011 at 02:04:38PM +0200, Marek Szyprowski wrote: > 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> Half-acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> As mentioned in the original report, the setup routine should initialize queued_count, too, so only a half ack. Uwe
diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c index 6ba1461..6be2f79 100644 --- a/drivers/media/video/videobuf2-core.c +++ b/drivers/media/video/videobuf2-core.c @@ -1196,6 +1196,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); /*
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> --- drivers/media/video/videobuf2-core.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)