Skip to content

Commit

Permalink
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux…
Browse files Browse the repository at this point in the history
…/kernel/git/clk/linux

Pull clk fix from Stephen Boyd:
 "One more fix for the runtime PM clk patches. We're calling a runtime
  PM API that may schedule from somewhere that we can't do that. We
  change to the async version of pm_runtime_put() to fix it"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: use atomic runtime pm api in clk_core_is_enabled
  • Loading branch information
Linus Torvalds committed Dec 29, 2017
2 parents 4f2382f + 756efe1 commit c0208a3
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/clk/clk.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,8 @@ static bool clk_core_is_enabled(struct clk_core *core)

ret = core->ops->is_enabled(core->hw);
done:
clk_pm_runtime_put(core);
if (core->dev)
pm_runtime_put(core->dev);

return ret;
}
Expand Down

0 comments on commit c0208a3

Please sign in to comment.