Merge tag 'sunxi-drivers-for-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes

arndb · arndb · commit 8d674d09972a · 2021-12-17T16:04:54.000+01:00
Some new drivers changes for the Allwinner SoCs, fixing the shutdown path of the RSB driver * tag 'sunxi-drivers-for-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: bus: sunxi-rsb: Fix shutdown Link: https://lore.kernel.org/r/6f2f75ad-de62-49a4-82a4-8655a567a09e.lettre@localhost Signed-off-by: Arnd Bergmann <arnd@arndb.de>
diff --git a/drivers/bus/sunxi-rsb.c b/drivers/bus/sunxi-rsb.c
@@ -687,11 +687,11 @@ static int sunxi_rsb_hw_init(struct sunxi_rsb *rsb)
 
 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)

Original file line number	Diff line number	Diff line change
`@@ -687,11 +687,11 @@ static int sunxi_rsb_hw_init(struct sunxi_rsb *rsb)`
`687`	`687`
`688`	`688`	`static void sunxi_rsb_hw_exit(struct sunxi_rsb *rsb)`
`689`	`689`	`{`
`690`		`- /* Keep the clock and PM reference counts consistent. */`
`691`		`- if (pm_runtime_status_suspended(rsb->dev))`
`692`		`- pm_runtime_resume(rsb->dev);`
`693`	`690`	`reset_control_assert(rsb->rstc);`
`694`		`- clk_disable_unprepare(rsb->clk);`
	`691`	`+`
	`692`	`+ /* Keep the clock and PM reference counts consistent. */`
	`693`	`+ if (!pm_runtime_status_suspended(rsb->dev))`
	`694`	`+ clk_disable_unprepare(rsb->clk);`
`695`	`695`	`}`
`696`	`696`
`697`	`697`	`static int __maybe_unused sunxi_rsb_runtime_suspend(struct device *dev)`