Patch "clk: imx: imx8: Fix an error handling path in imx8_acm_clk_probe()" has been added to the 6.6-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

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

to the 6.6-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     clk-imx-imx8-fix-an-error-handling-path-in-imx8_acm_.patch
and it can be found in the queue-6.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 9a9323e764e05a6bc83defdb12e56eb0d2d68793
Author: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
Date:   Thu Sep 14 22:31:04 2023 +0200

    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@xxxxxxx>
    Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
    Signed-off-by: Abel Vesa <abel.vesa@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/clk/imx/clk-imx8-acm.c b/drivers/clk/imx/clk-imx8-acm.c
index 73b3b53549517..1c95ae905eec8 100644
--- 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;
 }