summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2019-08-08 14:26:02 +0200
committerStefan Agner <stefan.agner@toradex.com>2019-08-08 14:26:02 +0200
commitbb3b1efec4e5aea069413f039ed276b1445763f7 (patch)
tree6d6dea74b685a0580ebeeeb16b0abff5a862a505
parentea9b1d98e81a244b8bfc7d2db546df34d40418d2 (diff)
ASoC: soc-core: remove error due to probe deferral
Deferred probes shouldn't cause error messages in the boot log. Avoid printing with dev_err() in case EPROBE_DEFER is the return value. Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
-rw-r--r--sound/soc/soc-core.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6aeba0d66ec5..86087cb9e44e 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2076,10 +2076,12 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
mutex_lock(&client_mutex);
for_each_card_prelinks(card, i, dai_link) {
ret = soc_init_dai_link(card, dai_link);
- if (ret) {
- soc_cleanup_platform(card);
+ if (ret && ret != -EPROBE_DEFER) {
dev_err(card->dev, "ASoC: failed to init link %s: %d\n",
dai_link->name, ret);
+ }
+ if (ret) {
+ soc_cleanup_platform(card);
mutex_unlock(&client_mutex);
return ret;
}