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

Commit 1929a527 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Greg Kroah-Hartman
Browse files

clk: core: Fix runtime PM sequence in clk_core_unprepare() 



[ Upstream commit 4b592061f7b3971c70e8b72fc42aaead47c24701 ]

In the original commit 9a34b453 ("clk: Add support for runtime PM"),
the commit message mentioned that pm_runtime_put_sync() would be done
at the end of clk_core_unprepare(). This mirrors the operations in
clk_core_prepare() in the opposite order.

However, the actual code that was added wasn't in the order the commit
message described. Move clk_pm_runtime_put() to the end of
clk_core_unprepare() so that it is in the correct order.

Fixes: 9a34b453 ("clk: Add support for runtime PM")
Signed-off-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Reviewed-by: default avatarNícolas F. R. A. Prado <nfraprado@collabora.com>
Link: https://lore.kernel.org/r/20220822081424.1310926-3-wenst@chromium.org


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 577b32ab

drivers/clk/clk.c

+1 −2
Original line number Diff line number Diff line
@@ -852,10 +852,9 @@ static void clk_core_unprepare(struct clk_core *core) 
	if (core->ops->unprepare)

		core->ops->unprepare(core->hw);



	clk_pm_runtime_put(core);



	trace_clk_unprepare_complete(core);

	clk_core_unprepare(core->parent);

	clk_pm_runtime_put(core);

}



static void clk_core_unprepare_lock(struct clk_core *core)