Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0208a33 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/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
parents 4f2382f3 756efe13
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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;
}