From patchwork Fri Jun 10 12:04:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 869092 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5AC551e005064 for ; Fri, 10 Jun 2011 12:05:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756137Ab1FJME6 (ORCPT ); Fri, 10 Jun 2011 08:04:58 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:17961 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756111Ab1FJME5 (ORCPT ); Fri, 10 Jun 2011 08:04:57 -0400 Received: from spt2.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by mailout1.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTP id <0LMK00J59PK73J@mailout1.w1.samsung.com> for linux-media@vger.kernel.org; Fri, 10 Jun 2011 13:04:55 +0100 (BST) Received: from linux.samsung.com ([106.116.38.10]) by spt2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LMK0043LPK6H1@spt2.w1.samsung.com> for linux-media@vger.kernel.org; Fri, 10 Jun 2011 13:04:54 +0100 (BST) Received: from mcdsrvbld02.digital.local (unknown [106.116.37.23]) by linux.samsung.com (Postfix) with ESMTP id ABD1227004F; Fri, 10 Jun 2011 14:05:11 +0200 (CEST) Date: Fri, 10 Jun 2011 14:04:38 +0200 From: Marek Szyprowski Subject: [PATCH] media: vb2: reset queued_count value during queue reinitialization To: linux-media@vger.kernel.org Cc: Marek Szyprowski , Kyungmin Park , Pawel Osciak , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Message-id: <1307707479-16189-1-git-send-email-m.szyprowski@samsung.com> MIME-version: 1.0 X-Mailer: git-send-email 1.7.2.5 Content-type: text/plain; charset=UTF-8 Content-transfer-encoding: 8BIT Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 10 Jun 2011 12:05:06 +0000 (UTC) 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 --- drivers/media/video/videobuf2-core.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) 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); /*