aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/soc/generic
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2017-06-22 06:22:14 +0000
committerMark Brown <broonie@kernel.org>2017-06-23 13:02:59 +0100
commit32f2bcce3ed10b93236d747701a9c04d51626cc2 (patch)
treeac645f26e816b09881fa9731ec4651274352a900 /sound/soc/generic
parentASoC: audio-graph-card: tidyup asoc_simple_card_canonicalize_cpu() parameter (diff)
downloadwireguard-linux-32f2bcce3ed10b93236d747701a9c04d51626cc2.tar.xz
wireguard-linux-32f2bcce3ed10b93236d747701a9c04d51626cc2.zip
ASoC: audio-graph-scu-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>
Diffstat (limited to 'sound/soc/generic')
-rw-r--r--sound/soc/generic/audio-graph-scu-card.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/generic/audio-graph-scu-card.c b/sound/soc/generic/audio-graph-scu-card.c
index 05934b24627b..061c7a60d6b4 100644
--- a/sound/soc/generic/audio-graph-scu-card.c
+++ b/sound/soc/generic/audio-graph-scu-card.c
@@ -125,7 +125,7 @@ static int asoc_graph_card_dai_link_of(struct device_node *ep,
/* card->num_links includes Codec */
asoc_simple_card_canonicalize_cpu(dai_link,
- (card->num_links - 1) == 1);
+ of_graph_get_endpoint_count(dai_link->cpu_of_node) == 1);
} else {
/* FE is dummy */
dai_link->cpu_of_node = NULL;