If _omap2_clk_enable() fails, the clock's usecount must be decremented by one no matter whether the clock has a parent or not.
Signed-off-by: Paul Walmsley <[email protected]> --- 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 55f43d0..a9a2bbf 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c @@ -502,12 +502,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-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
