From: Paul Walmsley Date: Wed, 7 Jan 2009 15:23:45 +0000 (+0200) Subject: OMAP2/3 clock: omap2_clk_enable(): fix bugs in clockdomain handling X-Git-Tag: v2.6.28-omap1~27 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6d6e285e5a7912b1ea68fadac387304c914aaba8;p=linux-2.6-omap-h63xx.git OMAP2/3 clock: omap2_clk_enable(): fix bugs in clockdomain handling omap2_clk_enable() should enable a clock's clockdomain before attempting to enable its parent clock's clockdomain. Similarly, in the unlikely event that the parent clock enable fails, the clockdomain should be disabled. Signed-off-by: Paul Walmsley Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index 3f8354da62a..55f43d0e688 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c @@ -488,16 +488,17 @@ int omap2_clk_enable(struct clk *clk) if (++clk->usecount > 1) return 0; + omap2_clkdm_clk_enable(clk->clkdm.ptr, clk); + if (clk->parent) ret = omap2_clk_enable(clk->parent); if (ret != 0) { clk->usecount--; + omap2_clkdm_clk_disable(clk->clkdm.ptr, clk); return ret; } - omap2_clkdm_clk_enable(clk->clkdm.ptr, clk); - ret = _omap2_clk_enable(clk); if (ret != 0) {