From patchwork Thu Jan 22 22:18:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 5689141 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9E9459F333 for ; Thu, 22 Jan 2015 22:24:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CD03620272 for ; Thu, 22 Jan 2015 22:24:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F3FD02026F for ; Thu, 22 Jan 2015 22:24:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754170AbbAVWVC (ORCPT ); Thu, 22 Jan 2015 17:21:02 -0500 Received: from mail-we0-f169.google.com ([74.125.82.169]:48420 "EHLO mail-we0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752527AbbAVWUq (ORCPT ); Thu, 22 Jan 2015 17:20:46 -0500 Received: by mail-we0-f169.google.com with SMTP id u56so4444838wes.0; Thu, 22 Jan 2015 14:20:45 -0800 (PST) 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=I6gNXZGjau6Yirp5aq/WPrB1Frb9nIb5aUIUnpJOBFY=; b=GRCDwteXnUuhO2kMTTRZ/7RrOKOsxr9QDCD4zOWD3SrOAzhqThBimwEaTRNgE3R4Rf NmRYvI9NhLpRTdrr5b489l/GeeFKRbxrYg3eexZvYn6i570/0chCUStzZEBuFM+JQtl4 HMIoQF4kjwVOtpfC/90KyOIyKD01+dKexK4VeYkbJmFAAVLJcDpimQHMQGDYAwLiixJt v8FNezpFTh4r37N16Ada34KuXPwVmm+FjbsEmwUpHwtadRscJmfMRVzHhM9njeR83fv8 7dMRh+AL9UfOt0GpkwqA5Q8Q6YKitI52/mDUeTgW/D0vBw92UcXZie4f46+yhK4kKKQ2 uXjQ== X-Received: by 10.194.184.140 with SMTP id eu12mr7376278wjc.25.1421965245511; Thu, 22 Jan 2015 14:20:45 -0800 (PST) Received: from tango-charlie.Home ([2.218.173.171]) by mx.google.com with ESMTPSA id fi10sm4757888wib.13.2015.01.22.14.20.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Jan 2015 14:20:43 -0800 (PST) From: "Lad, Prabhakar" To: LMML , Scott Jiang , adi-buildroot-devel@lists.sourceforge.net Cc: LKML , Mauro Carvalho Chehab , "Lad, Prabhakar" Subject: [PATCH v2 02/15] media: blackfin: bfin_capture: release buffers in case start_streaming() call back fails Date: Thu, 22 Jan 2015 22:18:35 +0000 Message-Id: <1421965128-10470-3-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1421965128-10470-1-git-send-email-prabhakar.csengg@gmail.com> References: <1421965128-10470-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-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP this patch adds support to release the buffer by calling vb2_buffer_done(), with state marked as VB2_BUF_STATE_QUEUED if start_streaming() call back fails. Signed-off-by: Lad, Prabhakar --- drivers/media/platform/blackfin/bfin_capture.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c index d4eeae9..80463fa 100644 --- a/drivers/media/platform/blackfin/bfin_capture.c +++ b/drivers/media/platform/blackfin/bfin_capture.c @@ -345,6 +345,7 @@ static int bcap_start_streaming(struct vb2_queue *vq, unsigned int count) { struct bcap_device *bcap_dev = vb2_get_drv_priv(vq); struct ppi_if *ppi = bcap_dev->ppi; + struct bcap_buffer *buf, *tmp; struct ppi_params params; int ret; @@ -352,7 +353,7 @@ static int bcap_start_streaming(struct vb2_queue *vq, unsigned int count) ret = v4l2_subdev_call(bcap_dev->sd, video, s_stream, 1); if (ret && (ret != -ENOIOCTLCMD)) { v4l2_err(&bcap_dev->v4l2_dev, "stream on failed in subdev\n"); - return ret; + goto err; } /* set ppi params */ @@ -391,7 +392,7 @@ static int bcap_start_streaming(struct vb2_queue *vq, unsigned int count) if (ret < 0) { v4l2_err(&bcap_dev->v4l2_dev, "Error in setting ppi params\n"); - return ret; + goto err; } /* attach ppi DMA irq handler */ @@ -399,12 +400,21 @@ static int bcap_start_streaming(struct vb2_queue *vq, unsigned int count) if (ret < 0) { v4l2_err(&bcap_dev->v4l2_dev, "Error in attaching interrupt handler\n"); - return ret; + goto err; } reinit_completion(&bcap_dev->comp); bcap_dev->stop = false; + return 0; + +err: + list_for_each_entry_safe(buf, tmp, &bcap_dev->dma_queue, list) { + list_del(&buf->list); + vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED); + } + + return ret; } static void bcap_stop_streaming(struct vb2_queue *vq)