From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Walmsley Subject: [PATCH 20/22] OMAP2/3 clock: omap2_clk_enable(): fix logic Date: Mon, 22 Dec 2008 23:38:45 -0700 Message-ID: <20081223063844.8542.63041.stgit@localhost.localdomain> References: <20081223063709.8542.82882.stgit@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: Received: from utopia.booyaka.com ([72.9.107.138]:52913 "EHLO utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753028AbYLWGjx (ORCPT ); Tue, 23 Dec 2008 01:39:53 -0500 In-Reply-To: <20081223063709.8542.82882.stgit@localhost.localdomain> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: linux-omap@vger.kernel.org Cc: Paul Walmsley Rearrange the parent clock enable status check code so it actually makes sense. No functional change. Signed-off-by: Paul Walmsley --- arch/arm/mach-omap2/clock.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index fc2219d..c21767a 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c @@ -489,20 +489,23 @@ void omap2_clk_disable(struct clk *clk) int omap2_clk_enable(struct clk *clk) { - int ret = 0; + int ret; if (++clk->usecount > 1) return 0; omap2_clkdm_clk_enable(clk->clkdm.ptr, clk); - if (clk->parent) - ret = omap2_clk_enable(clk->parent); + if (clk->parent) { + int parent_ret; - if (ret != 0) { - clk->usecount--; - omap2_clkdm_clk_disable(clk->clkdm.ptr, clk); - return ret; + parent_ret = omap2_clk_enable(clk->parent); + + if (parent_ret != 0) { + clk->usecount--; + omap2_clkdm_clk_disable(clk->clkdm.ptr, clk); + return parent_ret; + } } ret = _omap2_clk_enable(clk);