diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-05-06 10:32:15 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-12 22:06:34 +0100 |
| commit | ce85a4d726ecd286f933d4eedf01c5acb4f47a38 (patch) | |
| tree | 97dc538834a6c246e0a9083d62e8e92e67ed55b1 /sound | |
| parent | ca5106ae3da0179dcee3ae21f3ea94f62e9fdb0c (diff) | |
| download | kernel-common-ce85a4d726ecd286f933d4eedf01c5acb4f47a38.tar.gz kernel-common-ce85a4d726ecd286f933d4eedf01c5acb4f47a38.tar.bz2 kernel-common-ce85a4d726ecd286f933d4eedf01c5acb4f47a38.zip | |
ASoC: dapm: Fix SUSPEND -> OFF bias sequence
Currently when the DAPM context bias level is SUSPEND and the target bias level
is OFF dapm_pre_sequence_async() will first transition to PREPARE and
dapm_post_sequence_async() will then transition back from PREPARE to STANDBY and
then to OFF.
This patch makes sure that dapm_pre_sequence_async() only transitions to PREPARE
when either going to ON or away from ON. This avoids the extra unnecessary
transitions.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-dapm.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index ef78a699bb20..6d6ceee447d5 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1612,8 +1612,11 @@ static void dapm_pre_sequence_async(void *data, async_cookie_t cookie) "ASoC: Failed to turn on bias: %d\n", ret); } - /* Prepare for a STADDBY->ON or ON->STANDBY transition */ - if (d->bias_level != d->target_bias_level) { + /* Prepare for a transition to ON or away from ON */ + if ((d->target_bias_level == SND_SOC_BIAS_ON && + d->bias_level != SND_SOC_BIAS_ON) || + (d->target_bias_level != SND_SOC_BIAS_ON && + d->bias_level == SND_SOC_BIAS_ON)) { ret = snd_soc_dapm_set_bias_level(d, SND_SOC_BIAS_PREPARE); if (ret != 0) dev_err(d->dev, |