[ARM] omap: fix omap1 clock usecount decrement bug (3ef48fac) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm/mach-omap1/clock.c

+11 −10

Original line number	Original line	Diff line number	Diff line
	@@ -590,27 +590,28 @@ static void omap1_init_ext_clk(struct clk * clk)
	static int omap1_clk_enable(struct clk *clk)		static int omap1_clk_enable(struct clk *clk)
	{		{
	int ret = 0;		int ret = 0;

	if (clk->usecount++ == 0) {		if (clk->usecount++ == 0) {
	if (likely(clk->parent)) {		if (clk->parent) {
	ret = omap1_clk_enable(clk->parent);		ret = omap1_clk_enable(clk->parent);
			if (ret)
	if (unlikely(ret != 0)) {		goto err;
	clk->usecount--;
	return ret;
	}

	if (clk->flags & CLOCK_NO_IDLE_PARENT)		if (clk->flags & CLOCK_NO_IDLE_PARENT)
	omap1_clk_deny_idle(clk->parent);		omap1_clk_deny_idle(clk->parent);
	}		}

	ret = clk->ops->enable(clk);		ret = clk->ops->enable(clk);
			if (ret) {
	if (unlikely(ret != 0) && clk->parent) {		if (clk->parent)
	omap1_clk_disable(clk->parent);		omap1_clk_disable(clk->parent);
	clk->usecount--;		goto err;
	}		}
	}		}
			return ret;

			err:
			clk->usecount--;
	return ret;		return ret;
	}		}