Rearrange the parent clock enable status check code so it actually makes sense. No functional change.
Signed-off-by: Paul Walmsley <[email protected]> --- 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 a9a2bbf..413fb68 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c @@ -483,20 +483,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); -- 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
