summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorLiam Girdwood <lrg@ti.com>2012-07-06 16:56:16 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-06 19:05:07 +0100
commit4123128ee4854a955dd4a94b31991f8cc38c9b5e (patch)
treea996124b158125553e2045c6c5cf7880aad64651 /sound/soc
parent01005a729a17ab419f61a366e22f3419e7a2c3fe (diff)
downloadlinux-4123128ee4854a955dd4a94b31991f8cc38c9b5e.tar.bz2
ASoC: dapm: Make sure all dapm contexts are updated
Make sure we set the bias level for all DAPM contexts when changing level. Signed-off-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-dapm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 114f2af5f304..7c9cd276c2fc 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -288,9 +288,9 @@ 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;
+
if (ret != 0)
goto out;