Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754856AbZA1UuI (ORCPT ); Wed, 28 Jan 2009 15:50:08 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755520AbZA1UcZ (ORCPT ); Wed, 28 Jan 2009 15:32:25 -0500 Received: from utopia.booyaka.com ([72.9.107.138]:47874 "EHLO utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755516AbZA1UcX (ORCPT ); Wed, 28 Jan 2009 15:32:23 -0500 MBOX-Line: From nobody Wed Jan 28 12:35:25 2009 From: Paul Walmsley Subject: [PATCH F 09/12] OMAP2/3 clock: omap2_clk_enable(): fix usecount decrement bug To: linux-arm-kernel@lists.arm.linux.org.uk, linux-kernel@vger.kernel.org Cc: linux-omap@vger.kernel.org, Paul Walmsley , Tony Lindgren Date: Wed, 28 Jan 2009 12:35:25 -0700 Message-ID: <20090128193522.2396.53732.stgit@localhost.localdomain> In-Reply-To: <20090128193326.2396.9437.stgit@localhost.localdomain> References: <20090128193326.2396.9437.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3.222.gddca MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1114 Lines: 37 If _omap2_clk_enable() fails, the clock's usecount must be decremented by one no matter whether the clock has a parent or not. linux-omap source commit is 75fc235fe0f671b56873a75994513df5e665b053. Signed-off-by: Paul Walmsley Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/clock.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index adbb928..5f17a2c 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c @@ -500,12 +500,10 @@ int omap2_clk_enable(struct clk *clk) ret = _omap2_clk_enable(clk); if (ret != 0) { + clk->usecount--; omap2_clkdm_clk_disable(clk->clkdm.ptr, clk); - - if (clk->parent) { + if (clk->parent) omap2_clk_disable(clk->parent); - clk->usecount--; - } } return ret; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/