| Message ID | 1399467948-8770-1-git-send-email-lars@metafoo.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ca5106ae3da0179dcee3ae21f3ea94f62e9fdb0c |
| Headers | show |
On Wed, May 07, 2014 at 03:05:44PM +0200, Lars-Peter Clausen wrote: > 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@vger.kernel.org (for 3.14+) > Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Why is this tagged for stable - is there a non-cosmetic issue here (your commit log doesn't make it apparent if there is?
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 */
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@vger.kernel.org (for 3.14+) Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- The series applies on topic/dapm --- sound/soc/soc-dapm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)