OSDN Git Service

ASoC: imx-spdif: don't print EPROBE_DEFER as error
authorStefan Agner <stefan@agner.ch>
Fri, 18 Jan 2019 09:06:56 +0000 (10:06 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 18 Jan 2019 18:08:47 +0000 (18:08 +0000)
Probe deferral is to be expected during normal operation, so avoid
printing an error when it is encountered.

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.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/fsl/imx-spdif.c

index fb896b2..797d66e 100644 (file)
@@ -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);