From: Kuninori Morimoto Date: Thu, 22 Jun 2017 06:22:14 +0000 (+0000) Subject: ASoC: audio-graph-scu-card: tidyup asoc_simple_card_canonicalize_cpu() parameter X-Git-Tag: android-x86-8.1-r1~2533^2~60^2^2~5^6~3 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=32f2bcce3ed10b93236d747701a9c04d51626cc2;p=android-x86%2Fkernel.git 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 Signed-off-by: Mark Brown --- 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;