mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
Test update to 4.14
This commit is contained in:
parent
57d33083f7
commit
dccb17c612
270 changed files with 149330 additions and 5 deletions
|
@ -0,0 +1,40 @@
|
|||
From 4ea26425ac651a8cb9eaf817ee624691b0ac9a69 Mon Sep 17 00:00:00 2001
|
||||
From: Phil Elwell <phil@raspberrypi.org>
|
||||
Date: Thu, 9 Feb 2017 14:36:44 +0000
|
||||
Subject: [PATCH 030/277] 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(-)
|
||||
|
||||
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
|
||||
index fee4b0ef5566..c728a4148903 100644
|
||||
--- a/sound/soc/soc-core.c
|
||||
+++ b/sound/soc/soc-core.c
|
||||
@@ -1124,7 +1124,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
|
||||
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_err(card->dev, "ASoC: CPU DAI %s not registered\n",
|
||||
+ dev_info(card->dev, "ASoC: CPU DAI %s not registered - will retry\n",
|
||||
dai_link->cpu_dai_name);
|
||||
goto _err_defer;
|
||||
}
|
||||
@@ -1137,7 +1137,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
|
||||
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;
|
||||
}
|
||||
--
|
||||
2.16.1
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue