soc: mediatek: mtk-svs: reset svs when svs_resume() fail

[ Upstream commit 6ddd34fad4442132610e38597cf72e53e01ed454 ]

Add svs reset when svs_resume() fail.

Fixes: cf5e0bed44dc ("soc: mediatek: fix missing clk_disable_unprepare() on err in svs_resume()")
Signed-off-by: Roger Lu <roger.lu@mediatek.com>
Link: https://lore.kernel.org/r/20230111074528.29354-3-roger.lu@mediatek.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/soc/mediatek/mtk-svs.c b/drivers/soc/mediatek/mtk-svs.c
index 9859e6cf6b8f97c29c2dce671022cdd8b10fb23f..e0b8aa75c84b65c1951f978eb52d2d0b6bfb31f3 100644 (file)
--- a/drivers/soc/mediatek/mtk-svs.c
+++ b/drivers/soc/mediatek/mtk-svs.c
@@ -1614,12 +1614,16 @@ static int svs_resume(struct device *dev)
 
        ret = svs_init02(svsp);
        if (ret)
-               goto out_of_resume;
+               goto svs_resume_reset_assert;
 
        svs_mon_mode(svsp);
 
        return 0;
 
+svs_resume_reset_assert:
+       dev_err(svsp->dev, "assert reset: %d\n",
+               reset_control_assert(svsp->rst));
+
 out_of_resume:
        clk_disable_unprepare(svsp->main_clk);
        return ret;