diff options
| author | Jernej Skrabec <jernej.skrabec@gmail.com> | 2021-11-21 09:35:37 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2021-11-22 10:02:57 +0100 |
| commit | 017a716e7b0e9d4ac06a4d7779bd04fca009bbc9 (patch) | |
| tree | 824fcb01c7476bf85f2b4eddd02bb21a9c71c673 /drivers/bus | |
| parent | Linux 5.16-rc1 (diff) | |
| download | linux-017a716e7b0e9d4ac06a4d7779bd04fca009bbc9.tar.xz linux-017a716e7b0e9d4ac06a4d7779bd04fca009bbc9.zip | |
bus: sunxi-rsb: Fix shutdown
Function sunxi_rsb_hw_exit() is sometimes called with pm runtime
disabled, so in such cases pm_runtime_resume() will fail with -EACCES.
Instead of doing whole dance of enabling pm runtime and thus clock just
to disable it again immediately, just check if disabling clock is
needed. That way calling pm_runtime_resume() is not needed at all.
Fixes: 4a0dbc12e618 ("bus: sunxi-rsb: Implement runtime power management")
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20211121083537.612473-1-jernej.skrabec@gmail.com
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/sunxi-rsb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/bus/sunxi-rsb.c b/drivers/bus/sunxi-rsb.c index 6f225dddc74f..4566e730ef2b 100644 --- a/drivers/bus/sunxi-rsb.c +++ b/drivers/bus/sunxi-rsb.c @@ -687,11 +687,11 @@ err_clk_disable: static void sunxi_rsb_hw_exit(struct sunxi_rsb *rsb) { - /* Keep the clock and PM reference counts consistent. */ - if (pm_runtime_status_suspended(rsb->dev)) - pm_runtime_resume(rsb->dev); reset_control_assert(rsb->rstc); - clk_disable_unprepare(rsb->clk); + + /* Keep the clock and PM reference counts consistent. */ + if (!pm_runtime_status_suspended(rsb->dev)) + clk_disable_unprepare(rsb->clk); } static int __maybe_unused sunxi_rsb_runtime_suspend(struct device *dev) |