aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-27 14:56:22 +0100
committerMark Brown <broonie@linaro.org>2013-09-27 14:56:22 +0100
commitaab5d23ef9934a2421ad46cbb15e097f87464692 (patch)
tree6e11c5af4b506b58774c92919c7a31d16e46b661 /sound
parent57754df746ec2d0ce2ab5841f16136587789a5b6 (diff)
parentae10e7e8f1c9d021c8daca750d743cc3baa12e6d (diff)
downloadlinux-linaro-stable-aab5d23ef9934a2421ad46cbb15e097f87464692.tar.gz
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-core.c1
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)
return -ENODEV;
list_add(&cpu_dai->dapm.list, &card->dapm_list);
- snd_soc_dapm_new_dai_widgets(&cpu_dai->dapm, cpu_dai);
}
if (cpu_dai->driver->probe) {