diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-27 09:56:22 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-27 09:56:22 -0400 |
| commit | aab5d23ef9934a2421ad46cbb15e097f87464692 (patch) | |
| tree | 6e11c5af4b506b58774c92919c7a31d16e46b661 /sound | |
| parent | 57754df746ec2d0ce2ab5841f16136587789a5b6 (diff) | |
| parent | ae10e7e8f1c9d021c8daca750d743cc3baa12e6d (diff) | |
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 4d0561312f3b..1a38be0d0ca8 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
| @@ -1380,7 +1380,6 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order) | |||
| 1380 | return -ENODEV; | 1380 | return -ENODEV; |
| 1381 | 1381 | ||
| 1382 | list_add(&cpu_dai->dapm.list, &card->dapm_list); | 1382 | list_add(&cpu_dai->dapm.list, &card->dapm_list); |
| 1383 | snd_soc_dapm_new_dai_widgets(&cpu_dai->dapm, cpu_dai); | ||
| 1384 | } | 1383 | } |
| 1385 | 1384 | ||
| 1386 | if (cpu_dai->driver->probe) { | 1385 | if (cpu_dai->driver->probe) { |