kernel: bump 5.4 to 5.4.48
[oweals/openwrt.git] / target / linux / bcm27xx / patches-5.4 / 950-0024-sound-Demote-deferral-errors-to-INFO-level.patch
1 From afabe0abad549625f731baa088c21965a970ffa7 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Thu, 9 Feb 2017 14:36:44 +0000
4 Subject: [PATCH] sound: Demote deferral errors to INFO level
5
6 At present there is no mechanism to specify driver load order,
7 which can lead to deferrals and repeated retries until successful.
8 Since this situation is expected, reduce the dmesg level to
9 INFO and mention that the operation will be retried.
10
11 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
12 ---
13  sound/soc/soc-core.c | 4 ++--
14  1 file changed, 2 insertions(+), 2 deletions(-)
15
16 --- a/sound/soc/soc-core.c
17 +++ b/sound/soc/soc-core.c
18 @@ -898,7 +898,7 @@ static int soc_bind_dai_link(struct snd_
19         /* FIXME: we need multi CPU support in the future */
20         rtd->cpu_dai = snd_soc_find_dai(dai_link->cpus);
21         if (!rtd->cpu_dai) {
22 -               dev_info(card->dev, "ASoC: CPU DAI %s not registered\n",
23 +               dev_info(card->dev, "ASoC: CPU DAI %s not registered - will retry\n",
24                          dai_link->cpus->dai_name);
25                 goto _err_defer;
26         }
27 @@ -909,7 +909,7 @@ static int soc_bind_dai_link(struct snd_
28         for_each_link_codecs(dai_link, i, codec) {
29                 rtd->codec_dais[i] = snd_soc_find_dai(codec);
30                 if (!rtd->codec_dais[i]) {
31 -                       dev_info(card->dev, "ASoC: CODEC DAI %s not registered\n",
32 +                       dev_info(card->dev, "ASoC: CODEC DAI %s not registered - will retry\n",
33                                  codec->dai_name);
34                         goto _err_defer;
35                 }