From patchwork Sun Mar 8 14:40:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar X-Patchwork-Id: 28586 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1YUcRU-0000id-Lm; Sun, 08 Mar 2015 15:44:32 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-7) with esmtp id 1YUcRS-0000wf-1L; Sun, 08 Mar 2015 15:44:32 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752943AbbCHOoM (ORCPT + 1 other); Sun, 8 Mar 2015 10:44:12 -0400 Received: from mail-wg0-f49.google.com ([74.125.82.49]:43852 "EHLO mail-wg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752608AbbCHOlN (ORCPT ); Sun, 8 Mar 2015 10:41:13 -0400 Received: by wggx12 with SMTP id x12so12083421wgg.10; Sun, 08 Mar 2015 07:41:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nGJR3Ne0cqgi2AAzfT+0WBG86f5PDftD9OrJvymEN5Q=; b=ZZvR+kbBJIEmWKre+a/9Rw+VsfRBvgxn6WqdvFYGF5Do2Um67Ttz3rhqpJEMrXzu3Y B5dFrhJzD9BPw1TransgKuAzJFgDu1GCBjlF1t8c/ZyyEp/qqwPKlUAPvloZsCD/FkNF ZTillSovg7zNFyLVoCe0leQ0f+ehUn6STP4djlZv7LTPQYq/F1cJv4FCDdO4LOKBBvkb X4snb3iwYZQib65OOddz0q8ves5LiS4NYOImFi7L7i25Wm46db5pDgzSujPhuZIRuk4T dA2g7dhHVbdXQfB1lwWjc8SPJJytE4GdgOD79xPN1KAxNr7FcJrEk5KBNzChZ9CafcH/ OrgA== X-Received: by 10.194.62.74 with SMTP id w10mr48037644wjr.95.1425825671805; Sun, 08 Mar 2015 07:41:11 -0700 (PDT) Received: from tango-charlie.Home (0545247b.skybroadband.com. [5.69.36.123]) by mx.google.com with ESMTPSA id ka1sm24040321wjc.2.2015.03.08.07.41.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 08 Mar 2015 07:41:11 -0700 (PDT) From: Lad Prabhakar To: Scott Jiang , linux-media@vger.kernel.org, Hans Verkuil Cc: adi-buildroot-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, "Lad, Prabhakar" Subject: [PATCH v4 09/17] media: blackfin: bfin_capture: make sure all buffers are returned on stop_streaming() callback Date: Sun, 8 Mar 2015 14:40:45 +0000 Message-Id: <1425825653-14768-10-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1425825653-14768-1-git-send-email-prabhakar.csengg@gmail.com> References: <1425825653-14768-1-git-send-email-prabhakar.csengg@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2015.3.8.143619 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1300_1399 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, REFERENCES 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: "Lad, Prabhakar" In start_streaming() callback the buffer is removed from the dma_queue list and assigned to cur_frm, this patch makes sure that is returned to vb2 core with VB2_BUF_STATE_ERROR flag. Signed-off-by: Lad, Prabhakar Acked-by: Scott Jiang Tested-by: Scott Jiang --- drivers/media/platform/blackfin/bfin_capture.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c index 2a9e933..f2b1a23 100644 --- a/drivers/media/platform/blackfin/bfin_capture.c +++ b/drivers/media/platform/blackfin/bfin_capture.c @@ -374,6 +374,9 @@ static void bcap_stop_streaming(struct vb2_queue *vq) "stream off failed in subdev\n"); /* release all active buffers */ + if (bcap_dev->cur_frm) + vb2_buffer_done(&bcap_dev->cur_frm->vb, VB2_BUF_STATE_ERROR); + while (!list_empty(&bcap_dev->dma_queue)) { bcap_dev->cur_frm = list_entry(bcap_dev->dma_queue.next, struct bcap_buffer, list);