diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-16 12:42:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-16 12:42:53 +0000 |
| commit | 99896f714a0a940d84476bc6208319f70af30789 (patch) | |
| tree | 89002aa02e1308caf0c6a9d99fb5a722aee750e0 /sound/soc/soc-core.c | |
| parent | a9b68d3b90988dd13c668d6b1d45cdca1557f070 (diff) | |
| parent | f7d3c17096f6cbca8f0113d5a092ffcc72c7bf41 (diff) | |
Merge remote-tracking branch 'asoc/topic/dapm' into for-tiwai
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 18583660efbc..fe1df50805a3 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1728,6 +1728,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) } snd_soc_dapm_link_dai_widgets(card); + snd_soc_dapm_connect_dai_link_widgets(card); if (card->controls) snd_soc_add_card_controls(card, card->controls, card->num_controls); |