leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ARM] omap: fix clockdomain enable/disable ordering

Browse Source 
Based on a patch from Paul Walmsley <paul@pwsan.com>:

 omap2_clk_enable() should enable a clock's clockdomain before
 attempting to enable its parent clock's clockdomain.  Similarly, in
 the unlikely event that the parent clock enable fails, the clockdomain
 should be disabled.

 linux-omap source commit is 6d6e285e5a7912b1ea68fadac387304c914aaba8.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2009-01-31 11:02:37 +00:00 committed by Russell King
parent a7f8c599c5
commit 8263e5b31e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/mach-omap2/clock.c
View File

@ -419,20 +419,17 @@ int omap2_clk_enable(struct clk *clk)
int ret = 0; int ret = 0;
if (clk->usecount++ == 0) { if (clk->usecount++ == 0) {
if (clk->clkdm)
omap2_clkdm_clk_enable(clk->clkdm, clk);
if (clk->parent) { if (clk->parent) {
ret = omap2_clk_enable(clk->parent); ret = omap2_clk_enable(clk->parent);
if (ret) if (ret)
goto err; goto err;
} }
if (clk->clkdm)
omap2_clkdm_clk_enable(clk->clkdm, clk);
ret = _omap2_clk_enable(clk); ret = _omap2_clk_enable(clk);
if (ret) { if (ret) {
if (clk->clkdm)
omap2_clkdm_clk_disable(clk->clkdm, clk);
if (clk->parent) if (clk->parent)
omap2_clk_disable(clk->parent); omap2_clk_disable(clk->parent);
@ -442,6 +439,8 @@ int omap2_clk_enable(struct clk *clk)
return ret; return ret;
err: err:
if (clk->clkdm)
omap2_clkdm_clk_disable(clk->clkdm, clk);
clk->usecount--; clk->usecount--;
return ret; return ret;
} }