summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorCristian Ciocaltea <cristian.ciocaltea@collabora.com>2023-08-24 22:38:37 +0300
committerMark Brown <broonie@kernel.org>2023-08-24 21:10:45 +0100
commit199cd64140f222c66b68ebe288a3fcd0570e2e41 (patch)
treeb677ffa2c1f7d92f7afcf00e77063727b9347ef7 /sound
parent8886e1b03669c498f7a24bc5e483f46db5e81f82 (diff)
downloadlinux-stable-199cd64140f222c66b68ebe288a3fcd0570e2e41.tar.gz
linux-stable-199cd64140f222c66b68ebe288a3fcd0570e2e41.tar.bz2
linux-stable-199cd64140f222c66b68ebe288a3fcd0570e2e41.zip
ASoC: soc-core.c: Do not error if a DAI link component is not found
A recent cleanup of soc_dai_link_sanity_check() is responsible for generating lots of confusing errors before returning -EPROBE_DEFER: acp5x_mach acp5x_mach.0: ASoC: Component acp5x_i2s_dma.0 not found for link acp5x-8821-play [...] acp5x_mach acp5x_mach.0: ASoC: Component spi-VLV1776:00 not found for link acp5x-CS35L41-Stereo [...] acp5x_mach acp5x_mach.0: ASoC: Component spi-VLV1776:01 not found for link acp5x-CS35L41-Stereo Switch back to the initial behaviour of logging those messages on KERN_DEBUG level instead of KERN_ERR. While at it, use the correct form of the verb in 'component_not_find' label. Fixes: 0e66a2c69409 ("ASoC: soc-core.c: cleanup soc_dai_link_sanity_check()") Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com Link: https://lore.kernel.org/r/20230824193837.369761-1-cristian.ciocaltea@collabora.com Signed-off-by: Mark Brown <broonie@kernel.org
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-core.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index a5b96c17633a..cc442c52cdea 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -942,7 +942,7 @@ static int soc_dai_link_sanity_check(struct snd_soc_card *card,
* component list.
*/
if (!soc_find_component(dlc))
- goto component_not_find;
+ goto component_not_found;
}
/* Platform check */
@@ -963,7 +963,7 @@ static int soc_dai_link_sanity_check(struct snd_soc_card *card,
* component list.
*/
if (!soc_find_component(dlc))
- goto component_not_find;
+ goto component_not_found;
}
/* CPU check */
@@ -988,7 +988,7 @@ static int soc_dai_link_sanity_check(struct snd_soc_card *card,
* Defer card registration if Component is not added
*/
if (!soc_find_component(dlc))
- goto component_not_find;
+ goto component_not_found;
}
}
@@ -1002,8 +1002,8 @@ component_empty:
dev_err(card->dev, "ASoC: Neither Component name/of_node are set for %s\n", link->name);
return -EINVAL;
-component_not_find:
- dev_err(card->dev, "ASoC: Component %s not found for link %s\n", dlc->name, link->name);
+component_not_found:
+ dev_dbg(card->dev, "ASoC: Component %s not found for link %s\n", dlc->name, link->name);
return -EPROBE_DEFER;
dai_empty: