summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-08-24 15:36:55 +0200
committerMark Brown <broonie@linaro.org>2014-08-26 09:15:15 +0100
commit5819c2fa55d4a6eaf7fe025a393dce98fc4b2116 (patch)
tree7a823739e053482b4cf5f1749404c5fe22004322 /sound/soc/soc-core.c
parentc5599b87a8317738a541d8893cb327df5d04b007 (diff)
downloadlinux-5819c2fa55d4a6eaf7fe025a393dce98fc4b2116.tar.gz
linux-5819c2fa55d4a6eaf7fe025a393dce98fc4b2116.tar.bz2
linux-5819c2fa55d4a6eaf7fe025a393dce98fc4b2116.zip
ASoC: Restore idle_bias_off initialization
This was accidentally lost in commit f1d45cc3ae96 ("ASoC: Consolidate platform and CODEC probe/remove"). Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
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 c36983a133fa..419682693886 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -4010,6 +4010,7 @@ static int snd_soc_component_initialize(struct snd_soc_component *component,
dapm->dev = dev;
dapm->component = component;
dapm->bias_level = SND_SOC_BIAS_OFF;
+ dapm->idle_bias_off = true;
if (driver->seq_notifier)
dapm->seq_notifier = snd_soc_component_seq_notifier;
if (driver->stream_event)
@@ -4399,6 +4400,7 @@ int snd_soc_register_codec(struct device *dev,
codec->component.read = snd_soc_codec_drv_read;
codec->component.ignore_pmdown_time = codec_drv->ignore_pmdown_time;
codec->dapm.codec = codec;
+ codec->dapm.idle_bias_off = codec_drv->idle_bias_off;
if (codec_drv->seq_notifier)
codec->dapm.seq_notifier = codec_drv->seq_notifier;
if (codec_drv->set_bias_level)