Commit f7d344a2 authored by Shengjiu Wang's avatar Shengjiu Wang Committed by Mark Brown

ASoC: soc-core: skip zero num_dai component in searching dai name

In the case like dmaengine which's not a dai but as a component, the
num_dai is zero, dmaengine component has the same component_of_node
as cpu dai, when cpu dai component is not ready, but dmaengine component
is ready, try to get cpu dai name, the snd_soc_get_dai_name() return
-EINVAL, not -EPROBE_DEFER, that cause below error:

asoc-simple-card <card name>: parse error -22
asoc-simple-card: probe of <card name> failed with error -22

The sound card failed to probe.

So this patch fixes the issue above by skipping the zero num_dai
component in searching dai name.
Signed-off-by: default avatarShengjiu Wang <shengjiu.wang@nxp.com>
Link: https://lore.kernel.org/r/1644491952-7457-1-git-send-email-shengjiu.wang@nxp.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 83a1bed1
...@@ -3233,7 +3233,7 @@ int snd_soc_get_dai_name(const struct of_phandle_args *args, ...@@ -3233,7 +3233,7 @@ int snd_soc_get_dai_name(const struct of_phandle_args *args,
for_each_component(pos) { for_each_component(pos) {
struct device_node *component_of_node = soc_component_to_node(pos); struct device_node *component_of_node = soc_component_to_node(pos);
if (component_of_node != args->np) if (component_of_node != args->np || !pos->num_dai)
continue; continue;
ret = snd_soc_component_of_xlate_dai_name(pos, args, dai_name); ret = snd_soc_component_of_xlate_dai_name(pos, args, dai_name);
......
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