[PATCH 5.10 171/452] ASoC: rk3328: fix disabling mclk on pclk probe failure

From: Greg Kroah-Hartman
Date: Tue Jun 07 2022 - 13:36:52 EST


From: Nicolas Frattaroli <frattaroli.nicolas@xxxxxxxxx>

[ Upstream commit dd508e324cdde1c06ace08a8143fa50333a90703 ]

If preparing/enabling the pclk fails, the probe function should
unprepare and disable the previously prepared and enabled mclk,
which it doesn't do. This commit rectifies this.

Fixes: c32759035ad2 ("ASoC: rockchip: support ACODEC for rk3328")
Signed-off-by: Nicolas Frattaroli <frattaroli.nicolas@xxxxxxxxx>
Reviewed-by: Katsuhiro Suzuki <katsuhiro@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20220427172310.138638-1-frattaroli.nicolas@xxxxxxxxx
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
---
sound/soc/codecs/rk3328_codec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/codecs/rk3328_codec.c b/sound/soc/codecs/rk3328_codec.c
index aed18cbb9f68..e40b97929f6c 100644
--- a/sound/soc/codecs/rk3328_codec.c
+++ b/sound/soc/codecs/rk3328_codec.c
@@ -481,7 +481,7 @@ static int rk3328_platform_probe(struct platform_device *pdev)
ret = clk_prepare_enable(rk3328->pclk);
if (ret < 0) {
dev_err(&pdev->dev, "failed to enable acodec pclk\n");
- return ret;
+ goto err_unprepare_mclk;
}

base = devm_platform_ioremap_resource(pdev, 0);
--
2.35.1