OSDN Git Service

ASoC: rockchip: i2s: Fix missing clk_disable_unprepare() in rockchip_i2s_probe
authorMiaoqian Lin <linmq006@gmail.com>
Mon, 7 Mar 2022 08:35:52 +0000 (08:35 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 8 Mar 2022 12:27:57 +0000 (12:27 +0000)
Fix the missing clk_disable_unprepare() before return
from rockchip_i2s_probe() in the error handling case.

Fixes: 01605ad12875 ("ASoC: rockchip-i2s: enable "hclk" for rockchip I2S controller")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Link: https://lore.kernel.org/r/20220307083553.26009-1-linmq006@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/rockchip/rockchip_i2s.c

index a6d7656..4ce5d25 100644 (file)
@@ -716,19 +716,23 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
        i2s->mclk = devm_clk_get(&pdev->dev, "i2s_clk");
        if (IS_ERR(i2s->mclk)) {
                dev_err(&pdev->dev, "Can't retrieve i2s master clock\n");
-               return PTR_ERR(i2s->mclk);
+               ret = PTR_ERR(i2s->mclk);
+               goto err_clk;
        }
 
        regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
-       if (IS_ERR(regs))
-               return PTR_ERR(regs);
+       if (IS_ERR(regs)) {
+               ret = PTR_ERR(regs);
+               goto err_clk;
+       }
 
        i2s->regmap = devm_regmap_init_mmio(&pdev->dev, regs,
                                            &rockchip_i2s_regmap_config);
        if (IS_ERR(i2s->regmap)) {
                dev_err(&pdev->dev,
                        "Failed to initialise managed register map\n");
-               return PTR_ERR(i2s->regmap);
+               ret = PTR_ERR(i2s->regmap);
+               goto err_clk;
        }
 
        i2s->bclk_ratio = 64;
@@ -768,7 +772,8 @@ err_suspend:
                i2s_runtime_suspend(&pdev->dev);
 err_pm_disable:
        pm_runtime_disable(&pdev->dev);
-
+err_clk:
+       clk_disable_unprepare(i2s->hclk);
        return ret;
 }