]> git.proxmox.com Git - mirror_ubuntu-zesty-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)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 8 Aug 2017 12:51:58 +0000 (14:51 +0200)
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 baa1afa41e3dd57fdc36655b7d3bbd147ade820f..0ddeffcc48d6c14f275ea6409d1a7de8f1f64183 100644 (file)
@@ -1056,7 +1056,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;
        }
@@ -1068,7 +1068,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;
                }