Commit 2833548e authored by Matthias Reichl's avatar Matthias Reichl Committed by Mark Brown

ASoC: core: Don't defer probe on optional, NULL components

cpu and platform are optional components in DAI links. For example
codec-codec links usually have no platform set.

Call snd_soc_find_component only if the name or of_node of
a cpu or platform is set. Otherwise it will return NULL and
soc_init_dai_link bails out immediately with -EPROBE_DEFER,
meaning registering a card with NULL cpu or platform in DAI links
can never succeed.

Fixes: 8780cf11 ("ASoC: soc-core: defer card probe until all component is added to list")
Signed-off-by: default avatarMatthias Reichl <hias@horus.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5a7b2aab
...@@ -1135,7 +1135,8 @@ static int soc_init_dai_link(struct snd_soc_card *card, ...@@ -1135,7 +1135,8 @@ static int soc_init_dai_link(struct snd_soc_card *card,
* Defer card registartion if platform dai component is not added to * Defer card registartion if platform dai component is not added to
* component list. * component list.
*/ */
if (!soc_find_component(link->platform->of_node, link->platform->name)) if ((link->platform->of_node || link->platform->name) &&
!soc_find_component(link->platform->of_node, link->platform->name))
return -EPROBE_DEFER; return -EPROBE_DEFER;
/* /*
...@@ -1154,7 +1155,8 @@ static int soc_init_dai_link(struct snd_soc_card *card, ...@@ -1154,7 +1155,8 @@ static int soc_init_dai_link(struct snd_soc_card *card,
* Defer card registartion if cpu dai component is not added to * Defer card registartion if cpu dai component is not added to
* component list. * component list.
*/ */
if (!soc_find_component(link->cpu_of_node, link->cpu_name)) if ((link->cpu_of_node || link->cpu_name) &&
!soc_find_component(link->cpu_of_node, link->cpu_name))
return -EPROBE_DEFER; return -EPROBE_DEFER;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment