diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-16 19:40:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-16 19:40:27 +0100 |
| commit | d5efccd5b6843c504042735c1e20d9252daefd98 (patch) | |
| tree | 87994943963bf2f34b3f1fa982d909fd82f56746 /sound/soc/soc-core.c | |
| parent | 516541a00c6a6bced133158f0146b602a18dcbe5 (diff) | |
| parent | e816b57a337ea3b755de72bec38c10c864f23015 (diff) | |
| download | linux-d5efccd5b6843c504042735c1e20d9252daefd98.tar.gz linux-d5efccd5b6843c504042735c1e20d9252daefd98.tar.bz2 linux-d5efccd5b6843c504042735c1e20d9252daefd98.zip | |
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.c | 2 |
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, snd_soc_dapm_new_dai_widgets(&platform->dapm, dai); } + platform->dapm.idle_bias_off = 1; + if (driver->probe) { ret = driver->probe(platform); if (ret < 0) { |