diff options
author | Mark Brown <broonie@kernel.org> | 2015-08-30 15:51:52 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-08-30 15:51:52 +0100 |
commit | 24ecc23cf62a48ae47ccc40f0f226d45c962512e (patch) | |
tree | 91d4f94ae19c126854baecfa893f4ab17530b39a /sound/soc/soc-dapm.c | |
parent | a1780653b906ca342f20812570e1f07edb35b907 (diff) | |
parent | abd31b32dde4683df6fd0439caa314aafd751698 (diff) | |
download | linux-24ecc23cf62a48ae47ccc40f0f226d45c962512e.tar.bz2 |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r-- | sound/soc/soc-dapm.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index e0de8072c514..e556e6b6efd1 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3821,11 +3821,6 @@ static void dapm_connect_dai_link_widgets(struct snd_soc_card *card, for (i = 0; i < rtd->num_codecs; i++) { struct snd_soc_dai *codec_dai = rtd->codec_dais[i]; - /* there is no point in connecting BE DAI links with dummies */ - if (snd_soc_dai_is_dummy(codec_dai) || - snd_soc_dai_is_dummy(cpu_dai)) - continue; - /* connect BE DAI playback if widgets are valid */ if (codec_dai->playback_widget && cpu_dai->playback_widget) { source = cpu_dai->playback_widget; |