[PATCH v2] ASoC: ti: davinci-mcasp: fix error handling in davinci_mcasp_probe

Peter Ujfalusi peter.ujfalusi at ti.com
Mon Nov 2 10:07:50 CET 2020



On 02/11/2020 10.54, Zhang Qilong wrote:
> Forgetting to call pm_runtime_disable if davinci_mcasp_get_dt_params
> failed in function davinci_mcasp_probe, and we should go to error
> handling branch.

Acked-by: Peter Ujfalusi <peter.ujfalusi at ti.com>

> Signed-off-by: Zhang Qilong <zhangqilong3 at huawei.com>
> ---
> Changelog:
> V2
> - changed the subject and fixed the description.
> ---
>  sound/soc/ti/davinci-mcasp.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
> index 4b46dd827f3f..ec90c23c9e20 100644
> --- a/sound/soc/ti/davinci-mcasp.c
> +++ b/sound/soc/ti/davinci-mcasp.c
> @@ -2362,8 +2362,10 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
>  		goto err;
>  
>  	ret = davinci_mcasp_get_dt_params(mcasp);
> -	if (ret)
> -		return -EINVAL;
> +	if (ret) {
> +		ret = -EINVAL;
> +		goto err;
> +	}
>  
>  	ret = devm_snd_soc_register_component(&pdev->dev,
>  					&davinci_mcasp_component,
> 

- Péter

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki


More information about the Alsa-devel mailing list