p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge commit 'f17a0dd1c2e0' into clk-next

This commit is contained in:
Michael Turquette 2016-06-16 22:07:08 -07:00
parent 72ad679aa7 f17a0dd1c2
commit 071a0cb66c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/clk/clk.c
View File

@ -688,12 +688,12 @@ static void clk_core_disable(struct clk_core *core)
if (--core->enable_count > 0)
return;
trace_clk_disable(core);
trace_clk_disable_rcuidle(core);
if (core->ops->disable)
core->ops->disable(core->hw);
trace_clk_disable_complete(core);
trace_clk_disable_complete_rcuidle(core);
clk_core_disable(core->parent);
}
@ -741,12 +741,12 @@ static int clk_core_enable(struct clk_core *core)
if (ret)
return ret;
trace_clk_enable(core);
trace_clk_enable_rcuidle(core);
if (core->ops->enable)
ret = core->ops->enable(core->hw);
trace_clk_enable_complete(core);
trace_clk_enable_complete_rcuidle(core);
if (ret) {
clk_core_disable(core->parent);