summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-23 18:10:42 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-25 13:50:21 +0100
commitd8c3bb911f5afc32f7276c2e2e89eb58af4306ae (patch)
tree53d927bc75fc589c46835ac633761d3e09ffc661 /sound/soc
parentbc72d26bdb23c908ad52ec2d321a137d27762f08 (diff)
downloadlinux-stable-d8c3bb911f5afc32f7276c2e2e89eb58af4306ae.tar.gz
linux-stable-d8c3bb911f5afc32f7276c2e2e89eb58af4306ae.tar.bz2
linux-stable-d8c3bb911f5afc32f7276c2e2e89eb58af4306ae.zip
ASoC: dapm: Make sure we update the bias level for CODECs with no op
Commit 412312 (ASoC: dapm: Make sure all dapm contexts are updated) ensures that we update non-CODEC DAPM contexts but means that if a CODEC has no set_bias_level() operation it'll not be updated. Fix that. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-dapm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index dd7c49fafd75..145ec4b56ca9 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -291,6 +291,8 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm,
if (dapm->codec->driver->set_bias_level)
ret = dapm->codec->driver->set_bias_level(dapm->codec,
level);
+ else
+ dapm->bias_level = level;
} else
dapm->bias_level = level;