On Wed, 18 May 2016, Alexander Stein wrote:
In case there is no DAI (yet), do not print an error, this might happen a lot of times. Print a notice instead.
Signed-off-by: Alexander Stein alexander.stein@systec-electronic.com
Changes in v2:
- Add addional change in soc_bind_aux_dev()
Acked-by: Ricard Wanderlof ricardw@axis.com
/Ricard
sound/soc/soc-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index d2e62b15..ce5f835 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1001,7 +1001,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_notice(card->dev, "ASoC: CPU DAI %s not registered\n", dai_link->cpu_dai_name);@@ -1013,7 +1013,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_notice(card->dev, "ASoC: CODEC DAI %s not registered\n", codecs[i].dai_name); goto _err_defer;@@ -1042,7 +1042,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, rtd->platform = platform; } if (!rtd->platform) {
dev_err(card->dev, "ASoC: platform %s not registered\n",
dev_notice(card->dev, "ASoC: platform %s not registered\n", dai_link->platform_name);@@ -1698,7 +1698,7 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num) return 0;
err_defer:
- dev_err(card->dev, "ASoC: %s not registered\n", name);
- dev_notice(card->dev, "ASoC: %s not registered\n", name); return -EPROBE_DEFER;
}
-- 2.7.3
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel