Unverified Commit f725d205 authored by Miaoqian Lin's avatar Miaoqian Lin Committed by Mark Brown
Browse files

ASoC: rockchip: i2s: Fix missing clk_disable_unprepare() in rockchip_i2s_probe 



Fix the missing clk_disable_unprepare() before return
from rockchip_i2s_probe() in the error handling case.

Fixes: 01605ad1 ("ASoC: rockchip-i2s: enable "hclk" for rockchip I2S controller")
Signed-off-by: default avatarMiaoqian Lin <linmq006@gmail.com>
Link: https://lore.kernel.org/r/20220307083553.26009-1-linmq006@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6f6f28bf

sound/soc/rockchip/rockchip_i2s.c

+10 −5
Original line number Diff line number Diff line
@@ -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 @@ static int rockchip_i2s_probe(struct platform_device *pdev) 
		i2s_runtime_suspend(&pdev->dev);

err_pm_disable:

	pm_runtime_disable(&pdev->dev);



err_clk:

	clk_disable_unprepare(i2s->hclk);

	return ret;

}