clk: imx: imx8: Fix an error handling path in imx8_acm_clk_probe()

[ Upstream commit e9a164e367f039629fd5466a79b9f495646e1261 ]

If an error occurs after a successful clk_imx_acm_attach_pm_domains() call,
it must be undone.

Add an explicit error handling path, re-order the code and add the missing
clk_imx_acm_detach_pm_domains() call.

Fixes: d3a0946d7ac9 ("clk: imx: imx8: add audio clock mux driver")
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/clk/imx/clk-imx8-acm.c b/drivers/clk/imx/clk-imx8-acm.c
index 73b3b53..1c95ae9 100644 (file)
--- a/drivers/clk/imx/clk-imx8-acm.c
+++ b/drivers/clk/imx/clk-imx8-acm.c
@@ -374,7 +374,6 @@ static int imx8_acm_clk_probe(struct platform_device *pdev)
                                                                                0, NULL, NULL);
                if (IS_ERR(hws[sels[i].clkid])) {
                        ret = PTR_ERR(hws[sels[i].clkid]);
-                       pm_runtime_disable(&pdev->dev);
                        goto err_clk_register;
                }
        }
@@ -384,12 +383,16 @@ static int imx8_acm_clk_probe(struct platform_device *pdev)
        ret = devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, clk_hw_data);
        if (ret < 0) {
                dev_err(dev, "failed to register hws for ACM\n");
-               pm_runtime_disable(&pdev->dev);
+               goto err_clk_register;
        }
 
-err_clk_register:
+       pm_runtime_put_sync(&pdev->dev);
+       return 0;
 
+err_clk_register:
        pm_runtime_put_sync(&pdev->dev);
+       pm_runtime_disable(&pdev->dev);
+       clk_imx_acm_detach_pm_domains(&pdev->dev, &priv->dev_pm);
 
        return ret;
 }