Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31de06ef authored by Nicolas Frattaroli's avatar Nicolas Frattaroli Committed by Greg Kroah-Hartman
Browse files

ASoC: rk3328: fix disabling mclk on pclk probe failure 



[ 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: c3275903 ("ASoC: rockchip: support ACODEC for rk3328")
Signed-off-by: default avatarNicolas Frattaroli <frattaroli.nicolas@gmail.com>
Reviewed-by: default avatarKatsuhiro Suzuki <katsuhiro@katsuster.net>
Link: https://lore.kernel.org/r/20220427172310.138638-1-frattaroli.nicolas@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ed8d5cf1

sound/soc/codecs/rk3328_codec.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -479,7 +479,7 @@ static int rk3328_platform_probe(struct platform_device *pdev) 
	ret = clk_prepare_enable(rk3328->pclk);

	ret = clk_prepare_enable(rk3328->pclk);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(&pdev->dev, "failed to enable acodec pclk\n");

		dev_err(&pdev->dev, "failed to enable acodec pclk\n");

		return ret;

		goto err_unprepare_mclk;

	}

	}





	base = devm_platform_ioremap_resource(pdev, 0);

	base = devm_platform_ioremap_resource(pdev, 0);