diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2017-06-22 06:21:49 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-06-23 13:02:56 +0100 |
| commit | 47ca9593decee772a48d630af815aabedf99e694 (patch) | |
| tree | 1f954b7b48f6ffd2643d3f049d2f92416ecad750 /sound | |
| parent | fa2760dd366c735637504d1d7efab7688391c6b4 (diff) | |
| download | linux-47ca9593decee772a48d630af815aabedf99e694.tar.gz linux-47ca9593decee772a48d630af815aabedf99e694.tar.bz2 linux-47ca9593decee772a48d630af815aabedf99e694.zip | |
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/generic/audio-graph-card.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index 885b405d7844..ee752f62d89d 100644 --- 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); |