Skip to content

Commit 199cd64

Browse files
cristiccbroonie
authored andcommitted
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: 0e66a2c ("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
1 parent 8886e1b commit 199cd64

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

sound/soc/soc-core.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -942,7 +942,7 @@ static int soc_dai_link_sanity_check(struct snd_soc_card *card,
942942
* component list.
943943
*/
944944
if (!soc_find_component(dlc))
945-
goto component_not_find;
945+
goto component_not_found;
946946
}
947947

948948
/* Platform check */
@@ -963,7 +963,7 @@ static int soc_dai_link_sanity_check(struct snd_soc_card *card,
963963
* component list.
964964
*/
965965
if (!soc_find_component(dlc))
966-
goto component_not_find;
966+
goto component_not_found;
967967
}
968968

969969
/* CPU check */
@@ -988,7 +988,7 @@ static int soc_dai_link_sanity_check(struct snd_soc_card *card,
988988
* Defer card registration if Component is not added
989989
*/
990990
if (!soc_find_component(dlc))
991-
goto component_not_find;
991+
goto component_not_found;
992992
}
993993
}
994994

@@ -1002,8 +1002,8 @@ static int soc_dai_link_sanity_check(struct snd_soc_card *card,
10021002
dev_err(card->dev, "ASoC: Neither Component name/of_node are set for %s\n", link->name);
10031003
return -EINVAL;
10041004

1005-
component_not_find:
1006-
dev_err(card->dev, "ASoC: Component %s not found for link %s\n", dlc->name, link->name);
1005+
component_not_found:
1006+
dev_dbg(card->dev, "ASoC: Component %s not found for link %s\n", dlc->name, link->name);
10071007
return -EPROBE_DEFER;
10081008

10091009
dai_empty:

0 commit comments

Comments
 (0)