diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-24 12:56:40 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-24 12:56:40 +0000 |
| commit | cf82602c41cb3076b0d2efe92d9b080542897861 (patch) | |
| tree | 99967d02aa47726a162387f2780f818a168f7b20 /sound/soc/soc-core.c | |
| parent | f2ec1d3b25776051a9205289dab12e9401d33f8a (diff) | |
| parent | 86d7500326ea71ea72aeaf0da78671eef28be2af (diff) | |
| download | blackbird-op-linux-cf82602c41cb3076b0d2efe92d9b080542897861.tar.gz blackbird-op-linux-cf82602c41cb3076b0d2efe92d9b080542897861.zip | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 2c62620abca6..c024962ba500 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1626,9 +1626,6 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) } } - if (card->fully_routed) - snd_soc_dapm_auto_nc_pins(card); - snd_soc_dapm_new_widgets(card); ret = snd_card_register(card->snd_card); |
