]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
sound: Demote deferral errors to INFO level
authorPhil Elwell <phil@raspberrypi.org>
Thu, 9 Feb 2017 14:36:44 +0000 (14:36 +0000)
committerKhalid Elmously <khalid.elmously@canonical.com>
Fri, 16 Feb 2018 22:07:53 +0000 (17:07 -0500)
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

index 13c875e2392a40ec5651d7c12a28b9ac9f3aab85..23d56057e49b5ff6b6c3c352c150fee8cf7d8752 100644 (file)
@@ -1072,7 +1072,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;
        }
@@ -1084,7 +1084,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;
                }