Commit ca5106ae authored May 07, 2014 by Lars-Peter Clausen Committed by Mark Brown May 12, 2014

ASoC: dapm: Skip CODEC<->CODEC links in connect_dai_link_widgets()

For CODEC to CODEC DAI links the paths are created in snd_soc_dapm_new_pcm().
Also for CODEC to CODEC links the widgets are connected cross-over via a DAI
link widget, meaning that the capture widget of one CODEC will be connected to
the playback widget of the other and vice versa. Whereas
snd_soc_dapm_connect_dai_link_widgets() directly connects the playback widget of
the CPU DAI to the playback widget of the CODEC DAI and the capture widget of
the CPU DAI to the capture widget of the CODEC DAI. So not skipping
CODEC<->CODEC links in snd_soc_dapm_connect_dai_link_widgets() will create
incorrect connections between the two CODECs which will cause DAPM to detect
active paths where there are none and unnecessarily power up widgets.

Fixes: b893ea5f ("ASoC: sapm: Automatically connect DAI link widgets in DAPM graph.")
Cc: <stable@vger.kernel.org> (for 3.14+)
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

parent 2697e4fb

sound/soc/soc-dapm.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -3475,8 +3475,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 */

Admin message