[alsa-devel] [PATCH 2/5] ASoC: imx-spdif: don't print EPROBE_DEFER as error

Nicolin Chen nicoleotsuka at gmail.com
Thu Jan 17 23:00:42 CET 2019


On Thu, Jan 17, 2019 at 10:06:37AM +0100, Stefan Agner wrote:

> Removing the goto would not be strictly necessary. However, if
> code gets added later, the cleanup in the EPROBE_DEFER case likely
> would get missed.

Considering there is no code being added between them over the
years, I am okay to remove it since it makes things clean. But
as you mentioned, we gotta be careful if code gets added later.

> Signed-off-by: Stefan Agner <stefan at agner.ch>

Acked-by: Nicolin Chen <nicoleotsuka at gmail.com>

> ---
>  sound/soc/fsl/imx-spdif.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/sound/soc/fsl/imx-spdif.c b/sound/soc/fsl/imx-spdif.c
> index fb896b2c9ba3..797d66e43d49 100644
> --- a/sound/soc/fsl/imx-spdif.c
> +++ b/sound/soc/fsl/imx-spdif.c
> @@ -67,10 +67,8 @@ static int imx_spdif_audio_probe(struct platform_device *pdev)
>  		goto end;
>  
>  	ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
> -	if (ret) {
> +	if (ret && ret != -EPROBE_DEFER)
>  		dev_err(&pdev->dev, "snd_soc_register_card failed: %d\n", ret);
> -		goto end;
> -	}
>  
>  end:
>  	of_node_put(spdif_np);
> -- 
> 2.20.1
> 


More information about the Alsa-devel mailing list