[alsa-devel] [PATCH 1/5] ASoC: dapm: Skip CODEC<->CODEC links in connect_dai_link_widgets()

[Lars-Peter Clausen]

For CODEC to CODEC DAI links the paths are already created in
snd_soc_dapm_new_pcm(). Make sure to not create additional connections in
snd_soc_dapm_connect_dai_link_widgets() for CODEC to CODEC links.

Fixes: b893ea5 ("ASoC: sapm: Automatically connect DAI link widgets in DAPM graph.")
Cc: stable at vger.kernel.org (for 3.14+)
Signed-off-by: Lars-Peter Clausen <lars at metafoo.de>
---
The series applies on topic/dapm
---
 sound/soc/soc-dapm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index fb6c7b7..142a738 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3410,8 +3410,11 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card)
 		cpu_dai = rtd->cpu_dai;
 		codec_dai = rtd->codec_dai;
 
-		/* dynamic FE links have no fixed DAI mapping */
-		if (rtd->dai_link->dynamic)
+		/*
+		 * dynamic FE links have no fixed DAI mapping.
+		 * CODEC<->CODEC links have no direct connection.
+		 */
+		if (rtd->dai_link->dynamic || rtd->dai_link->params)
 			continue;
 
 		/* there is no point in connecting BE DAI links with dummies */
-- 
1.8.0