diff options
| author | Chen-Yu Tsai <wenst@chromium.org> | 2022-08-22 10:14:24 +0200 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2022-08-23 01:17:46 +0200 |
| commit | 4b592061f7b3971c70e8b72fc42aaead47c24701 (patch) | |
| tree | 2ff01561de4bd8fb961112b3803b3f9bbda0bbcf /drivers/clk/clk.c | |
| parent | clk: core: Honor CLK_OPS_PARENT_ENABLE for clk gate ops (diff) | |
| download | linux-4b592061f7b3971c70e8b72fc42aaead47c24701.tar.xz linux-4b592061f7b3971c70e8b72fc42aaead47c24701.zip | |
clk: core: Fix runtime PM sequence in clk_core_unprepare()
In the original commit 9a34b45397e5 ("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: 9a34b45397e5 ("clk: Add support for runtime PM")
Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Link: https://lore.kernel.org/r/20220822081424.1310926-3-wenst@chromium.org
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Diffstat (limited to 'drivers/clk/clk.c')
| -rw-r--r-- | drivers/clk/clk.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 9b365cd6d14b..2e29a72c68e1 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -859,13 +859,12 @@ 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); if (core->flags & CLK_OPS_PARENT_ENABLE) clk_core_disable_lock(core->parent); clk_core_unprepare(core->parent); + clk_pm_runtime_put(core); } static void clk_core_unprepare_lock(struct clk_core *core) |