2019-09-19 14:43:19 +00:00
|
|
|
From fd613a5d5dc7f023d7d983aee9d854fd3a41d669 Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
|
|
|
Date: Thu, 9 Feb 2017 14:36:44 +0000
|
2019-12-23 12:42:55 +00:00
|
|
|
Subject: [PATCH] sound: Demote deferral errors to INFO level
|
2019-07-09 18:32:28 +00:00
|
|
|
|
|
|
|
|
At present there is no mechanism to specify driver load order,
|
|
|
|
|
which can lead to deferrals and repeated retries until successful.
|
|
|
|
|
Since this situation is expected, reduce the dmesg level to
|
|
|
|
|
INFO and mention that the operation will be retried.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
|
|
|
---
|
|
|
|
|
sound/soc/soc-core.c | 6 +++---
|
|
|
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/sound/soc/soc-core.c
|
|
|
|
|
+++ b/sound/soc/soc-core.c
|
|
|
|
|
@@ -868,8 +868,8 @@ static int soc_bind_dai_link(struct snd_
|
|
|
|
|
cpu_dai_component.dai_name = dai_link->cpu_dai_name;
|
|
|
|
|
rtd->cpu_dai = snd_soc_find_dai(&cpu_dai_component);
|
|
|
|
|
if (!rtd->cpu_dai) {
|
|
|
|
|
- dev_info(card->dev, "ASoC: CPU DAI %s not registered\n",
|
|
|
|
|
- dai_link->cpu_dai_name);
|
|
|
|
|
+ dev_info(card->dev, "ASoC: CPU DAI %s not registered - will retry\n",
|
|
|
|
|
+ dai_link->cpu_dai_name);
|
|
|
|
|
goto _err_defer;
|
|
|
|
|
}
|
|
|
|
|
snd_soc_rtdcom_add(rtd, rtd->cpu_dai->component);
|
|
|
|
|
@@ -881,7 +881,7 @@ static int soc_bind_dai_link(struct snd_
|
|
|
|
|
for (i = 0; i < rtd->num_codecs; i++) {
|
|
|
|
|
codec_dais[i] = snd_soc_find_dai(&codecs[i]);
|
|
|
|
|
if (!codec_dais[i]) {
|
|
|
|
|
- dev_err(card->dev, "ASoC: CODEC DAI %s not registered\n",
|
|
|
|
|
+ dev_info(card->dev, "ASoC: CODEC DAI %s not registered - will retry\n",
|
|
|
|
|
codecs[i].dai_name);
|
|
|
|
|
goto _err_defer;
|
|
|
|
|
}
|
