aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-16 14:40:27 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-16 14:40:27 -0400
commitd5efccd5b6843c504042735c1e20d9252daefd98 (patch)
tree87994943963bf2f34b3f1fa982d909fd82f56746 /sound/soc/soc-core.c
parent516541a00c6a6bced133158f0146b602a18dcbe5 (diff)
parente816b57a337ea3b755de72bec38c10c864f23015 (diff)
ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting annoyingly with the new development that's going on for Tegra so merge it up to resolve those conflicts. Conflicts: sound/soc/soc-core.c sound/soc/tegra/tegra_i2s.c sound/soc/tegra/tegra_spdif.c
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 77f35292f1b0..5d308e92f9b0 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1072,6 +1072,8 @@ static int soc_probe_platform(struct snd_soc_card *card,
1072 snd_soc_dapm_new_dai_widgets(&platform->dapm, dai); 1072 snd_soc_dapm_new_dai_widgets(&platform->dapm, dai);
1073 } 1073 }
1074 1074
1075 platform->dapm.idle_bias_off = 1;
1076
1075 if (driver->probe) { 1077 if (driver->probe) {
1076 ret = driver->probe(platform); 1078 ret = driver->probe(platform);
1077 if (ret < 0) { 1079 if (ret < 0) {