From patchwork Mon Dec 17 14:55:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 206886 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9780F2C0079 for ; Tue, 18 Dec 2012 02:01:31 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tkc86-0005iI-CC; Mon, 17 Dec 2012 14:57:18 +0000 Received: from tx2ehsobe001.messaging.microsoft.com ([65.55.88.11] helo=tx2outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tkc82-0005i2-Jp for linux-arm-kernel@lists.infradead.org; Mon, 17 Dec 2012 14:57:15 +0000 Received: from mail248-tx2-R.bigfish.com (10.9.14.249) by TX2EHSOBE004.bigfish.com (10.9.40.24) with Microsoft SMTP Server id 14.1.225.23; Mon, 17 Dec 2012 14:57:13 +0000 Received: from mail248-tx2 (localhost [127.0.0.1]) by mail248-tx2-R.bigfish.com (Postfix) with ESMTP id D450010800B8; Mon, 17 Dec 2012 14:57:12 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1de0h1202h1e76h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1155h) Received: from mail248-tx2 (localhost.localdomain [127.0.0.1]) by mail248-tx2 (MessageSwitch) id 1355756155380129_13904; Mon, 17 Dec 2012 14:55:55 +0000 (UTC) Received: from TX2EHSMHS006.bigfish.com (unknown [10.9.14.252]) by mail248-tx2.bigfish.com (Postfix) with ESMTP id 415FEEC0051; Mon, 17 Dec 2012 14:55:55 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS006.bigfish.com (10.9.99.106) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 17 Dec 2012 14:55:55 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-005.039d.mgd.msft.net (10.84.1.17) with Microsoft SMTP Server (TLS) id 14.2.318.3; Mon, 17 Dec 2012 14:55:54 +0000 Received: from fabio-Latitude-E6410.am.freescale.net ([10.29.244.38]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id qBHEtnKG024734; Mon, 17 Dec 2012 07:55:50 -0700 From: Fabio Estevam To: Subject: [PATCH] ARM: mach-imx6q: Do not run error code path in success case Date: Mon, 17 Dec 2012 12:55:47 -0200 Message-ID: <1355756147-24856-1-git-send-email-fabio.estevam@freescale.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121217_095714_903948_147EB5A6 X-CRM114-Status: UNSURE ( 8.96 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [65.55.88.11 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Fabio Estevam , linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org The 'put_clk' path should only run in the case of failure, so provide a 'return' to avoid it running in the success case. Signed-off-by: Fabio Estevam --- arch/arm/mach-imx/mach-imx6q.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 4eb1b3a..61f50aa 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -134,6 +134,8 @@ static void __init imx6q_sabrelite_cko1_setup(void) clk_set_parent(cko1_sel, ahb); rate = clk_round_rate(cko1, 16000000); clk_set_rate(cko1, rate); + + return; put_clk: if (!IS_ERR(cko1_sel)) clk_put(cko1_sel);