lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ARM] omap: fix omap1 clock usecount decrement bug

Browse Source 
Same fix as per a7f8c59, but for OMAP1 instead.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2009-04-05 12:27:24 +01:00
committed by Russell King
parent 0221c81b1b
commit 3ef48fac6e
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
arch/arm/mach-omap1/clock.c
View File

@@ -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 (likely(clk->parent)) {
ret = omap1_clk_enable(clk->parent);
if (unlikely(ret != 0)) { if (clk->usecount++ == 0) {
clk->usecount--; if (clk->parent) {
return ret; ret = omap1_clk_enable(clk->parent);
} if (ret)
goto err;
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;
} }