8299d1f057
Rebased RPi foundation patches on linux 5.10.59, removed applied and reverted patches, wireless patches and defconfig patches. bcm2708: boot tested on RPi B+ v1.2 bcm2709: boot tested on RPi 4B v1.1 4G bcm2711: boot tested on RPi 4B v1.1 4G Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From 2a0e0c15c001bfde3666f159552e414217fe44ac Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Thu, 9 Feb 2017 14:36:44 +0000
|
|
Subject: [PATCH] sound: Demote deferral errors to INFO level
|
|
|
|
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 | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/sound/soc/soc-core.c
|
|
+++ b/sound/soc/soc-core.c
|
|
@@ -1016,7 +1016,7 @@ int snd_soc_add_pcm_runtime(struct snd_s
|
|
for_each_link_cpus(dai_link, i, cpu) {
|
|
asoc_rtd_to_cpu(rtd, i) = snd_soc_find_dai(cpu);
|
|
if (!asoc_rtd_to_cpu(rtd, i)) {
|
|
- dev_info(card->dev, "ASoC: CPU DAI %s not registered\n",
|
|
+ dev_info(card->dev, "ASoC: CPU DAI %s not registered - will retry\n",
|
|
cpu->dai_name);
|
|
goto _err_defer;
|
|
}
|
|
@@ -1027,7 +1027,7 @@ int snd_soc_add_pcm_runtime(struct snd_s
|
|
for_each_link_codecs(dai_link, i, codec) {
|
|
asoc_rtd_to_codec(rtd, i) = snd_soc_find_dai(codec);
|
|
if (!asoc_rtd_to_codec(rtd, i)) {
|
|
- dev_info(card->dev, "ASoC: CODEC DAI %s not registered\n",
|
|
+ dev_info(card->dev, "ASoC: CODEC DAI %s not registered- will retry\n",
|
|
codec->dai_name);
|
|
goto _err_defer;
|
|
}
|