summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorNicolas Frattaroli <frattaroli.nicolas@gmail.com>2022-04-27 19:23:11 +0200
committerMark Brown <broonie@kernel.org>2022-04-28 13:20:33 +0100
commitdd508e324cdde1c06ace08a8143fa50333a90703 (patch)
tree28b6d4876274d526553896cbb98d1b21a67eb71f /sound/soc
parent7e0bdbae446ff8a752484f6bcbcd7157e7484158 (diff)
downloadlinux-stable-dd508e324cdde1c06ace08a8143fa50333a90703.tar.gz
linux-stable-dd508e324cdde1c06ace08a8143fa50333a90703.tar.bz2
linux-stable-dd508e324cdde1c06ace08a8143fa50333a90703.zip
ASoC: rk3328: fix disabling mclk on pclk probe failure
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>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/rk3328_codec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/rk3328_codec.c b/sound/soc/codecs/rk3328_codec.c
index 758d439e8c7a..86b679cf7aef 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);