Skip to contentSkip to conversation

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

PATCH In review Ladislav Michl 2 participants 2 messages Feb 11, 2018 – Mar 14, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 sound: omap-twl4030: do not complain on -EPROBE_DEFER when initializing

Don't complain on -EPROBE_DEFER when initializing, the driver probe will be retried later.

---
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(-)
sound/soc/omap/omap-twl4030.c +4 -2
index cccc316743fa..7c1f71884768 100644
@@ -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;
 	}
 
Signature · 1 line
2.16.1
Acked-by on v2 1/1
#1 lore raw
Quoted 5 lines · Ladislav Michl

Don't complain on -EPROBE_DEFER when initializing, the driver probe will be retried later.

Quoted 15 lines

---
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(-)
sound/soc/omap/omap-twl4030.c +0 -0
index cccc316743fa..7c1f71884768 100644
@@ -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);

sound/soc/omap/omap-twl4030.c static int omap_twl4030_probe(struct platform_device *pdev) · line 331

Quoted 10 lines
sound/soc/omap/omap-twl4030.c +4 -2
 	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
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel