ASoC: audio-graph-card: tidyup asoc_simple_card_canonicalize_cpu() parameter

asoc_simple_card_canonicalize_cpu() 2nd param is asking CPU component's
DAI links, not Card links.
This patch fixup it. Otherwise, audio-graph-card can't handle CPU
component correctly if CPU has mult-DAIs and Card uses only one of them

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 885b405d7844484bb4130603af7069142afb51bc..ee752f62d89dd885ff40818aaa570025dcda9c75 100644 (file)
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -100,7 +100,6 @@ static int asoc_graph_card_dai_link_of(struct device_node *cpu_port,
        struct graph_dai_props *dai_props = graph_priv_to_props(priv, idx);
        struct asoc_simple_dai *cpu_dai = &dai_props->cpu_dai;
        struct asoc_simple_dai *codec_dai = &dai_props->codec_dai;
-       struct snd_soc_card *card = graph_priv_to_card(priv);
        struct device_node *cpu_ep    = of_get_next_child(cpu_port, NULL);
        struct device_node *codec_ep = of_graph_get_remote_endpoint(cpu_ep);
        struct device_node *rcpu_ep = of_graph_get_remote_endpoint(codec_ep);
@@ -162,7 +161,7 @@ static int asoc_graph_card_dai_link_of(struct device_node *cpu_port,
        dai_link->init = asoc_graph_card_dai_init;
 
        asoc_simple_card_canonicalize_cpu(dai_link,
-                                         card->num_links == 1);
+               of_graph_get_endpoint_count(dai_link->cpu_of_node) == 1);
 
 dai_link_of_err:
        of_node_put(cpu_ep);