summaryrefslogtreecommitdiff
path: root/drivers/bus
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-01-03 15:44:38 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-01-03 15:44:38 +0300
commit824adf37ee9ddf3ecba1bc245507bc5953dda268 (patch)
treeee85366f9e2c019b58492558d8ad406df35fd260 /drivers/bus
parentf2ee4759fb700b32a1bd830960fe86bf6bdfd0ab (diff)
parentc9e6606c7fe92b50a02ce51dda82586ebdf99b48 (diff)
downloadlinux-824adf37ee9ddf3ecba1bc245507bc5953dda268.tar.xz
Merge 5.16-rc8 into char-misc-next
We need the fixes in here as well for testing. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/bus')
-rw-r--r--drivers/bus/sunxi-rsb.c8
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)