lkml.org 
[lkml]   [2022]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.10 23/37] ASoC: soc-core: skip zero num_dai component in searching dai name
    Date
    From: Shengjiu Wang <shengjiu.wang@nxp.com>

    [ 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>
    ---
    sound/soc/soc-core.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
    index 133296596864..a6d6d10cd471 100644
    --- a/sound/soc/soc-core.c
    +++ b/sound/soc/soc-core.c
    @@ -3020,7 +3020,7 @@ int snd_soc_get_dai_name(struct of_phandle_args *args,
    for_each_component(pos) {
    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);
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-03-30 14:19    [W:3.474 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site