[PATCH] ASoC: rk3328: fix disabling mclk on pclk probe failure

Katsuhiro Suzuki katsuhiro at katsuster.net
Wed Apr 27 21:44:43 PDT 2022


Hello Nicolas,

Oh, indeed. Thanks for fix.

Reviewed-by: Katsuhiro Suzuki <katsuhiro at katsuster.net>


On 2022/04/28 2:23, Nicolas Frattaroli wrote:
> 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 at gmail.com>
> ---
>   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 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);




More information about the Linux-rockchip mailing list