ASoC: rk3328: fix disabling mclk on pclk probe failure

BugLink: https://bugs.launchpad.net/bugs/1981864
[ 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@gmail.com>
Reviewed-by: Katsuhiro Suzuki <katsuhiro@katsuster.net>
Link: https://lore.kernel.org/r/20220427172310.138638-1-frattaroli.nicolas@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/sound/soc/codecs/rk3328_codec.c b/sound/soc/codecs/rk3328_codec.c
index 758d439e8c7a57b1fdd0aa17aeb1e3086060889e..86b679cf7aef9f80873ad6306317c59cf9053b5a 100644 (file)
--- 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);