From a7b5d7c4969aba8d1f04c29048906abaa71fb6a9 Mon Sep 17 00:00:00 2001

From: Tony Lindgren <tony@atomide.com>

Date: Thu, 18 Feb 2021 13:06:57 +0200

Subject: [PATCH] bus: ti-sysc: Fix warning on unbind if reset is not deasserted

Git-commit: a7b5d7c4969aba8d1f04c29048906abaa71fb6a9

Patch-mainline: v5.12-rc5

References: git-fixes

We currently get thefollowing on driver unbind if a reset is configured

and asserted:

Warning: CPU: 0 PID: 993 at drivers/reset/core.c:432 reset_control_assert

...

(reset_control_assert) from [<c0fecda8>] (sysc_remove+0x190/0x1e4)

(sysc_remove) from [<c0a2bb58>] (platform_remove+0x24/0x3c)

(platform_remove) from [<c0a292fc>] (__device_release_driver+0x154/0x214)

(__device_release_driver) from [<c0a2a210>] (device_driver_detach+0x3c/0x8c)

(device_driver_detach) from [<c0a27d64>] (unbind_store+0x60/0xd4)

(unbind_store) from [<c0546bec>] (kernfs_fop_write_iter+0x10c/0x1cc)

Let's fix it by checking the reset status.

Signed-off-by: Tony Lindgren <tony@atomide.com>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/bus/ti-sysc.c | 4 +++-

 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c

index a27d751cf219..3d74f237f005 100644

--- a/drivers/bus/ti-sysc.c

+++ b/drivers/bus/ti-sysc.c

@@ -3053,7 +3053,9 @@ static int sysc_remove(struct platform_device *pdev)

 	pm_runtime_put_sync(&pdev->dev);

 	pm_runtime_disable(&pdev->dev);

-	reset_control_assert(ddata->rsts);

+

+	if (!reset_control_status(ddata->rsts))

+		reset_control_assert(ddata->rsts);

 unprepare:

 	sysc_unprepare(ddata);

-- 

2.26.2