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

BugLink: https://bugs.launchpad.net/bugs/1969110
[ Upstream commit f7d344a2bd5ec81fbd1ce76928fd059e57ec9bea ]

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: Shengjiu Wang <shengjiu.wang@nxp.com>
Link: https://lore.kernel.org/r/1644491952-7457-1-git-send-email-shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 0b620fce5eaeb4131a57d96227cdc4e535e1ffaa)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 80ca260595fda358a67e9960398a863e2533d52d..5da762807824d0f5b8caa5b145660923e184642c 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3208,7 +3208,7 @@ int snd_soc_get_dai_name(const struct of_phandle_args *args,
        for_each_component(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;
 
                ret = snd_soc_component_of_xlate_dai_name(pos, args, dai_name);