Skip to content

Commit

Permalink
ASoC: rk3328: fix missing clk_disable_unprepare() on error in rk3328_…
Browse files Browse the repository at this point in the history
…platform_probe()

[ Upstream commit d14eece ]

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

Fixes: c327590 ("ASoC: rockchip: support ACODEC for rk3328")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20210518075847.1116983-1-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Yang Yingliang authored and gregkh committed Jul 14, 2021
1 parent af74662 commit 4f66227
Showing 1 changed file with 22 additions and 6 deletions.
28 changes: 22 additions & 6 deletions sound/soc/codecs/rk3328_codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,8 @@ static int rk3328_platform_probe(struct platform_device *pdev)
rk3328->pclk = devm_clk_get(&pdev->dev, "pclk");
if (IS_ERR(rk3328->pclk)) {
dev_err(&pdev->dev, "can't get acodec pclk\n");
return PTR_ERR(rk3328->pclk);
ret = PTR_ERR(rk3328->pclk);
goto err_unprepare_mclk;
}

ret = clk_prepare_enable(rk3328->pclk);
Expand All @@ -484,19 +485,34 @@ static int rk3328_platform_probe(struct platform_device *pdev)
}

base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(base))
return PTR_ERR(base);
if (IS_ERR(base)) {
ret = PTR_ERR(base);
goto err_unprepare_pclk;
}

rk3328->regmap = devm_regmap_init_mmio(&pdev->dev, base,
&rk3328_codec_regmap_config);
if (IS_ERR(rk3328->regmap))
return PTR_ERR(rk3328->regmap);
if (IS_ERR(rk3328->regmap)) {
ret = PTR_ERR(rk3328->regmap);
goto err_unprepare_pclk;
}

platform_set_drvdata(pdev, rk3328);

return devm_snd_soc_register_component(&pdev->dev, &soc_codec_rk3328,
ret = devm_snd_soc_register_component(&pdev->dev, &soc_codec_rk3328,
rk3328_dai,
ARRAY_SIZE(rk3328_dai));
if (ret)
goto err_unprepare_pclk;

return 0;

err_unprepare_pclk:
clk_disable_unprepare(rk3328->pclk);

err_unprepare_mclk:
clk_disable_unprepare(rk3328->mclk);
return ret;
}

static const struct of_device_id rk3328_codec_of_match[] __maybe_unused = {
Expand Down

0 comments on commit 4f66227

Please sign in to comment.