From patchwork Fri May 25 06:29:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 11478 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SXoCF-0006xt-Du for patchwork@linuxtv.org; Fri, 25 May 2012 08:40:23 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp for id 1SXoCE-00005v-IG; Fri, 25 May 2012 08:40:23 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752791Ab2EYGkT (ORCPT ); Fri, 25 May 2012 02:40:19 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:59805 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750930Ab2EYGkR (ORCPT ); Fri, 25 May 2012 02:40:17 -0400 Received: by dady13 with SMTP id y13so843812dad.19 for ; Thu, 24 May 2012 23:40:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=B3sBPwQbgigEdWHThTlEbHmbiS5RikwfTElqywywEFA=; b=chNVXAjBrjH4vszHdGrZ+ADBjbDmnVbF8/KgVmTQ+kEJRldxXXYLj0Umovj7SakCAP 9daIQpeIA01BYIZur3oQXR0mZ5ievlQ/PmlTCNPvnm2YbYDZfre+6UqQyofXk+XXtij6 4NIX0yQ2wQ1KTWCI0nyXVKGW0wFenwWDUUUU0Gj/CwbyqjYrs5eMKdoiLeSSDwxWLDCG UDPBXV04FmtPI8QOWe2YlMNlBSF7kG0qJj6Alvm8QWTCQKBn3ugMlr0vk0Qz/YPxiWxb qKQPjDJaDQGbWHX3u+0Tk3QxDhvU83PvIjSWia4tPW2F4mQAbHCeGEwf++m4M4MW7NuF g8CQ== Received: by 10.68.230.68 with SMTP id sw4mr4521249pbc.142.1337928016790; Thu, 24 May 2012 23:40:16 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id mt9sm8066997pbb.14.2012.05.24.23.40.14 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 24 May 2012 23:40:16 -0700 (PDT) From: Sachin Kamat To: linux-media@vger.kernel.org Cc: s.nawrocki@samsung.com, mchehab@infradead.org, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 3/3] [media] s5p-fimc: Stop media entity pipeline if fimc_pipeline_validate fails Date: Fri, 25 May 2012 11:59:40 +0530 Message-Id: <1337927380-4435-3-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1337927380-4435-1-git-send-email-sachin.kamat@linaro.org> References: <1337927380-4435-1-git-send-email-sachin.kamat@linaro.org> X-Gm-Message-State: ALoCoQmn3ALkzDIty6IB7AW8y3KJSfIYtRes6UTYA03Vd/+q0HVxC3LhajmbnufgrLdbvXecCPyN Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.5.25.63018 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_1099 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' Stops the media entity pipeline which was started earlier if fimc_pipeline_validate fails. Signed-off-by: Sachin Kamat --- drivers/media/video/s5p-fimc/fimc-capture.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c index 587d087..d9efa64 100644 --- a/drivers/media/video/s5p-fimc/fimc-capture.c +++ b/drivers/media/video/s5p-fimc/fimc-capture.c @@ -1057,8 +1057,10 @@ static int fimc_cap_streamon(struct file *file, void *priv, if (fimc->vid_cap.user_subdev_api) { ret = fimc_pipeline_validate(fimc); - if (ret) + if (ret) { + media_entity_pipeline_stop(&p->subdevs[IDX_SENSOR]->entity); return ret; + } } return vb2_streamon(&fimc->vid_cap.vbq, type); }