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 <[email protected]> --- arch/arm/mach-omap2/clock.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index 3f8354d..55f43d0 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) { -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
