From patchwork Thu May 9 15:36:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sylwester Nawrocki/Kernel \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 2544521 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 868E6DF24C for ; Thu, 9 May 2013 15:38:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755847Ab3EIPiG (ORCPT ); Thu, 9 May 2013 11:38:06 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:35684 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755812Ab3EIPiD (ORCPT ); Thu, 9 May 2013 11:38:03 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MMJ005BMFF8JR20@mailout1.samsung.com> for linux-media@vger.kernel.org; Fri, 10 May 2013 00:38:02 +0900 (KST) X-AuditID: cbfee61a-b7fd56d0000022fd-98-518bc2da729b Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 50.A1.08957.AD2CB815; Fri, 10 May 2013 00:38:02 +0900 (KST) Received: from amdc1344.digital.local ([106.116.147.32]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MMJ00AHUFDDXM80@mmp2.samsung.com>; Fri, 10 May 2013 00:38:02 +0900 (KST) From: Sylwester Nawrocki To: linux-media@vger.kernel.org Cc: hj210.choi@samsung.com, dh09.lee@samsung.com, a.hajda@samsung.com, shaik.ameer@samsung.com, arun.kk@samsung.com, Sylwester Nawrocki , Kyungmin Park Subject: [PATCH 13/13] exynos4-is: Remove WARN_ON() from __fimc_pipeline_close() Date: Thu, 09 May 2013 17:36:45 +0200 Message-id: <1368113805-20233-14-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1368113805-20233-1-git-send-email-s.nawrocki@samsung.com> References: <1368113805-20233-1-git-send-email-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgluLIzCtJLcpLzFFi42I5/e+xoO6tQ92BBr+mGljcWneO1eLjqdus FtfP21k83niN2eJs0xt2i54NW1ktDr9pZ7U48nA3uwOHR9+WVYwenzfJBTBFcdmkpOZklqUW 6dslcGVcvPeLreA/V8XvtbsZGxhnc3YxcnJICJhInN73gBnCFpO4cG89G4gtJDCdUeLEXe8u Ri4gu4NJYvXut+wgCTYBQ4neo32MILaIgLzEk94bbCBFzAIXGSXWn9jLBJIQFgiQ+HrzO1gD i4CqxKN7i1hBbF4Bd4mrb28B1XAAbVOQmDPJBiTMCRTu/NzODrHYTWLWkiuMExh5FzAyrGIU TS1ILihOSs811CtOzC0uzUvXS87P3cQIDp9nUjsYVzZYHGIU4GBU4uH12NMdKMSaWFZcmXuI UYKDWUmEd8MGoBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXHeA63WgUIC6YklqdmpqQWpRTBZJg5O qQZGZm12mTBB+b236wLqy4L+P7/ifuyy7BYX6S2T9KK9Tzx5sm7H4topH0UrzKeFhnIt3qa8 gyF8wZ0ZHRcqyjfku1jodQqYXy4JdHWZydL53XTK5cq+wIMfvH9w17gUHvB4dln/83wdSb41 +nPWCpq4923cn3i2mvuE1uTV52yn+kUcOtntVbNSiaU4I9FQi7moOBEA7ItlnRsCAAA= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org It's not a critical error to call __fimc_pipeline_close() with missing sensor subdev entity. Replace WARN_ON() with pr_warn() and return 0 instead of -EINVAL to fix control flow in some conditions. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park --- drivers/media/platform/exynos4-is/media-dev.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c index bf932d7..beec27b 100644 --- a/drivers/media/platform/exynos4-is/media-dev.c +++ b/drivers/media/platform/exynos4-is/media-dev.c @@ -247,16 +247,16 @@ static int __fimc_pipeline_close(struct exynos_media_pipeline *ep) struct fimc_pipeline *p = to_fimc_pipeline(ep); struct v4l2_subdev *sd = p ? p->subdevs[IDX_SENSOR] : NULL; struct fimc_md *fmd; - int ret = 0; - - if (WARN_ON(sd == NULL)) - return -EINVAL; + int ret; - if (p->subdevs[IDX_SENSOR]) { - ret = fimc_pipeline_s_power(p, 0); - fimc_md_set_camclk(sd, false); + if (sd == NULL) { + pr_warn("%s(): No sensor subdev\n", __func__); + return 0; } + ret = fimc_pipeline_s_power(p, 0); + fimc_md_set_camclk(sd, false); + fmd = entity_to_fimc_mdev(&sd->entity); /* Disable PXLASYNC clock if this pipeline includes FIMC-IS */