Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7f8c599 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] omap: fix usecount decrement bug 



Based upon a patch from Paul Walmsley <paul@pwsan.com>:

 If _omap2_clk_enable() fails, the clock's usecount must be decremented
 by one no matter whether the clock has a parent or not.

but reorganised a bit.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent be5f34b7

arch/arm/mach-omap2/clock.c

+10 −10
Original line number Diff line number Diff line
@@ -419,30 +419,30 @@ int omap2_clk_enable(struct clk *clk) 
	int ret = 0;



	if (clk->usecount++ == 0) {

		if (clk->parent)

		if (clk->parent) {

			ret = omap2_clk_enable(clk->parent);



		if (ret != 0) {

			clk->usecount--;

			return ret;

			if (ret)

				goto err;

		}



		if (clk->clkdm)

			omap2_clkdm_clk_enable(clk->clkdm, clk);



		ret = _omap2_clk_enable(clk);



		if (ret != 0) {

		if (ret) {

			if (clk->clkdm)

				omap2_clkdm_clk_disable(clk->clkdm, clk);



			if (clk->parent) {

			if (clk->parent)

				omap2_clk_disable(clk->parent);

				clk->usecount--;

			}



			goto err;

		}

	}

	return ret;



err:

	clk->usecount--;

	return ret;

}