Thread (3 messages) 3 messages, 2 authors, 2021-08-24

[PATCH -next] soc: aspeed-lpc-ctrl: Fix missing clk_disable_unprepare() on error in aspeed_lpc_ctrl_probe()

From: Joel Stanley <joel@jms.id.au>
Date: 2021-08-24 04:52:28
Also in: lkml

On Mon, 23 Aug 2021 at 12:55, Yang Yingliang [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Fix the missing clk_disable_unprepare() before return
from aspeed_lpc_ctrl_probe() in the error handling case.

Fixes: 2f9b25fa6682 ("soc: aspeed: Re-enable FWH2AHB on AST2600")
Reported-by: Hulk Robot <redacted>
Signed-off-by: Yang Yingliang <redacted>
---
 drivers/soc/aspeed/aspeed-lpc-ctrl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/soc/aspeed/aspeed-lpc-ctrl.c b/drivers/soc/aspeed/aspeed-lpc-ctrl.c
index 6893c5ec3259..f4c989584d6b 100644
--- a/drivers/soc/aspeed/aspeed-lpc-ctrl.c
+++ b/drivers/soc/aspeed/aspeed-lpc-ctrl.c
@@ -312,7 +312,8 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev)
                lpc_ctrl->scu = syscon_regmap_lookup_by_compatible("aspeed,ast2600-scu");
                if (IS_ERR(lpc_ctrl->scu)) {
                        dev_err(dev, "couldn't find scu\n");
-                       return PTR_ERR(lpc_ctrl->scu);
+                       rc = PTR_ERR(lpc_ctrl->scu);
+                       goto err;
Thanks for the patch. Alternatively, we could move this code above the
devm_clk_get/clk_prepare_enable. I would prefer that option, if you
want to send a v2.

Cheers,

Joel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help