[PATCH] ASoC: codecs: Fix an error handling path in va_macro_probe()

Christophe JAILLET christophe.jaillet at wanadoo.fr
Sun Apr 3 08:17:21 CEST 2022


Le 03/04/2022 à 08:10, Christophe JAILLET a écrit :
> After a successful lpass_macro_pds_init() call, lpass_macro_pds_exit() must
> be called.
> 
> Add the missing call in the error handling path of the probe function and
> use it.
> 
> Fixes: 9e3d83c52844 ("ASoC: codecs: Add power domains support in digital macro codecs")

I'll send a V2. The same issue is also in lpass-tx-macro.c and 
lpass-rx-macro.c.

CJ

> Signed-off-by: Christophe JAILLET <christophe.jaillet at wanadoo.fr>
> ---
>   sound/soc/codecs/lpass-va-macro.c | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c
> index f3cb596058e0..d18b56e60433 100644
> --- a/sound/soc/codecs/lpass-va-macro.c
> +++ b/sound/soc/codecs/lpass-va-macro.c
> @@ -1434,8 +1434,10 @@ static int va_macro_probe(struct platform_device *pdev)
>   		va->dmic_clk_div = VA_MACRO_CLK_DIV_2;
>   	} else {
>   		ret = va_macro_validate_dmic_sample_rate(sample_rate, va);
> -		if (!ret)
> -			return -EINVAL;
> +		if (!ret) {
> +			ret = -EINVAL;
> +			goto err;
> +		}
>   	}
>   
>   	base = devm_platform_ioremap_resource(pdev, 0);
> @@ -1492,6 +1494,8 @@ static int va_macro_probe(struct platform_device *pdev)
>   err_dcodec:
>   	clk_disable_unprepare(va->macro);
>   err:
> +	lpass_macro_pds_exit(va->pds);
> +
>   	return ret;
>   }
>   



More information about the Alsa-devel mailing list