From f414252cde5779aa4a1adecf7032b25f2770b03a Mon Sep 17 00:00:00 2001 From: Li-Yu Yu Date: Mon, 3 Jan 2022 23:01:27 +0800 Subject: [PATCH 1/2] Revert "Revert "ASoC: soc-core: filter use of 'ignore_machine' field"" This reverts commit 76583781ba31998a14b7c9404a94ac5600ec4afb. --- sound/soc/soc-core.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 1d62160f96b117..d1975f13fc2873 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1771,6 +1771,19 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) match: /* machine matches, so override the rtd data */ for_each_card_prelinks(card, i, dai_link) { + struct snd_soc_dai_link_component *dlc; + struct snd_soc_dai *dai; + + /* + * ignore dailinks exposed by other components, with the + * assumption that all cpu_dais are exposed by the same + * component + */ + dlc = asoc_link_to_cpu(dai_link, 0); + dai = snd_soc_find_dai(dlc); + + if (!dai || dai->component != component) + continue; /* ignore this FE */ if (dai_link->dynamic) { From 410c598bb269f9e2c8fccaeb1d06116e4f58ec0b Mon Sep 17 00:00:00 2001 From: Li-Yu Yu Date: Mon, 3 Jan 2022 23:02:59 +0800 Subject: [PATCH 2/2] blind ci test --- 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 d1975f13fc2873..136f19044dd77c 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1782,7 +1782,7 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) dlc = asoc_link_to_cpu(dai_link, 0); dai = snd_soc_find_dai(dlc); - if (!dai || dai->component != component) + if (dai && dai->component != component) continue; /* ignore this FE */