| Message ID | 20180211212522.GA2411@lenoch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2018-02-11 23:25, Ladislav Michl wrote: > Don't complain on -EPROBE_DEFER when initializing, the driver probe > will be retried later. > > Signed-off-by: Ladislav Michl <ladis@linux-mips.org> > Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > --- > Changes: > -v2: fixed typo in commit log, added Jarkko Nikula's ack > > 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; > } > > - Péter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
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; }