diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-08-24 09:36:55 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-08-26 04:15:15 -0400 |
commit | 5819c2fa55d4a6eaf7fe025a393dce98fc4b2116 (patch) | |
tree | 7a823739e053482b4cf5f1749404c5fe22004322 | |
parent | c5599b87a8317738a541d8893cb327df5d04b007 (diff) |
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>
-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 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, | |||
4010 | dapm->dev = dev; | 4010 | dapm->dev = dev; |
4011 | dapm->component = component; | 4011 | dapm->component = component; |
4012 | dapm->bias_level = SND_SOC_BIAS_OFF; | 4012 | dapm->bias_level = SND_SOC_BIAS_OFF; |
4013 | dapm->idle_bias_off = true; | ||
4013 | if (driver->seq_notifier) | 4014 | if (driver->seq_notifier) |
4014 | dapm->seq_notifier = snd_soc_component_seq_notifier; | 4015 | dapm->seq_notifier = snd_soc_component_seq_notifier; |
4015 | if (driver->stream_event) | 4016 | if (driver->stream_event) |
@@ -4399,6 +4400,7 @@ int snd_soc_register_codec(struct device *dev, | |||
4399 | codec->component.read = snd_soc_codec_drv_read; | 4400 | codec->component.read = snd_soc_codec_drv_read; |
4400 | codec->component.ignore_pmdown_time = codec_drv->ignore_pmdown_time; | 4401 | codec->component.ignore_pmdown_time = codec_drv->ignore_pmdown_time; |
4401 | codec->dapm.codec = codec; | 4402 | codec->dapm.codec = codec; |
4403 | codec->dapm.idle_bias_off = codec_drv->idle_bias_off; | ||
4402 | if (codec_drv->seq_notifier) | 4404 | if (codec_drv->seq_notifier) |
4403 | codec->dapm.seq_notifier = codec_drv->seq_notifier; | 4405 | codec->dapm.seq_notifier = codec_drv->seq_notifier; |
4404 | if (codec_drv->set_bias_level) | 4406 | if (codec_drv->set_bias_level) |