summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-23 18:20:49 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-25 13:51:09 +0100
commit4e872a46823c64e655d997e1e04a4b32e326aa1b (patch)
tree3a766959b60345144c2f139687942ac0ad14a0c2 /sound
parentd8c3bb911f5afc32f7276c2e2e89eb58af4306ae (diff)
downloadlinux-4e872a46823c64e655d997e1e04a4b32e326aa1b.tar.gz
linux-4e872a46823c64e655d997e1e04a4b32e326aa1b.tar.bz2
linux-4e872a46823c64e655d997e1e04a4b32e326aa1b.zip
ASoC: dapm: Don't force card bias level to be updated
Commit 412312 (ASoC: dapm: Make sure all dapm contexts are updated) means that any DAPM context being updated will have the bias level automatically set, including the card. We can't safely do this as the card callbacks are called for each device context and so the management of the card bias is more complex. Several multi-component cards rely on this behaviour. Skip updates during the asynchronous run entirely. We should really do them in the synchronous section but it's not 100% clear which values to pick as the different DAPM contexts may have different bias levels. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-dapm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 145ec4b56ca9..f90139b5f50d 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -293,8 +293,9 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm,
level);
else
dapm->bias_level = level;
- } else
+ } else if (!card || dapm != &card->dapm) {
dapm->bias_level = level;
+ }
if (ret != 0)
goto out;