diff mbox

[RESEND] sound: omap-twl4030: do not complain on -EPROBE_DEFER when initializing

Message ID 20180124172048.GA2095@lenoch (mailing list archive)
State New, archived
Headers show

Commit Message

Ladislav Michl Jan. 24, 2018, 5:20 p.m. UTC
Don't complain on -EPROBE_DEFER when when initializing, the driver
probe will be retried later.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 Note: Just a resend of patch from 9 Nov 2016 as there were no
       reply by then.

 sound/soc/omap/omap-twl4030.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Jarkko Nikula Feb. 11, 2018, 6:01 p.m. UTC | #1
Hi

On 01/24/18 19:20, Ladislav Michl wrote:
> Don't complain on -EPROBE_DEFER when when initializing, the driver
> probe will be retried later.
> 
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
>  Note: Just a resend of patch from 9 Nov 2016 as there were no
>        reply by then.
> 
>  sound/soc/omap/omap-twl4030.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c
> index cccc316743fa..7c1f71884768 100644
> --- a/sound/soc/omap/omap-twl4030.c
> +++ b/sound/soc/omap/omap-twl4030.c
> @@ -322,8 +322,10 @@ static int omap_twl4030_probe(struct platform_device *pdev)
>  	snd_soc_card_set_drvdata(card, priv);
>  	ret = devm_snd_soc_register_card(&pdev->dev, card);
>  	if (ret) {
> -		dev_err(&pdev->dev, "devm_snd_soc_register_card() failed: %d\n",
> -			ret);
> +		if (ret != -EPROBE_DEFER)
> +			dev_err(&pdev->dev,
> +				"devm_snd_soc_register_card() failed: %d\n",
> +				ret);
>  		return ret;
>  	}

Sorry the delay. Please Cc Mark Brown <broonie@kernel.org> and repost.
You may add my

Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
diff mbox

Patch

diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c
index cccc316743fa..7c1f71884768 100644
--- a/sound/soc/omap/omap-twl4030.c
+++ b/sound/soc/omap/omap-twl4030.c
@@ -322,8 +322,10 @@  static int omap_twl4030_probe(struct platform_device *pdev)
 	snd_soc_card_set_drvdata(card, priv);
 	ret = devm_snd_soc_register_card(&pdev->dev, card);
 	if (ret) {
-		dev_err(&pdev->dev, "devm_snd_soc_register_card() failed: %d\n",
-			ret);
+		if (ret != -EPROBE_DEFER)
+			dev_err(&pdev->dev,
+				"devm_snd_soc_register_card() failed: %d\n",
+				ret);
 		return ret;
 	}