Re: [PATCH v2] soc: mediatek: fix missing clk_disable_unprepare() on err in svs_resume()

From: Matthias Brugger
Date: Thu Jun 23 2022 - 04:51:16 EST




On 23/06/2022 09:02, Peng Wu wrote:
Fix the missing clk_disable_unprepare() before return
from svs_resume() in the error handling case.

Signed-off-by: Peng Wu <wupeng58@xxxxxxxxxx>
Reported-by: Hulk Robot <hulkci@xxxxxxxxxx>

Applied, thanks!

---
v2:
- Same holds for the error path of svs_init02().
---
drivers/soc/mediatek/mtk-svs.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/soc/mediatek/mtk-svs.c b/drivers/soc/mediatek/mtk-svs.c
index 606a00a2e57d..87e05ab51552 100644
--- a/drivers/soc/mediatek/mtk-svs.c
+++ b/drivers/soc/mediatek/mtk-svs.c
@@ -1526,16 +1526,20 @@ static int svs_resume(struct device *dev)
ret = reset_control_deassert(svsp->rst);
if (ret) {
dev_err(svsp->dev, "cannot deassert reset %d\n", ret);
- return ret;
+ goto out_of_resume;
}
ret = svs_init02(svsp);
if (ret)
- return ret;
+ goto out_of_resume;
svs_mon_mode(svsp);
return 0;
+
+out_of_resume:
+ clk_disable_unprepare(svsp->main_clk);
+ return ret;
}
static int svs_bank_resource_setup(struct svs_platform *svsp)