summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorOlaya, Margarita <magi.olaya@ti.com>2010-12-10 21:05:46 -0600
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-12-14 20:36:37 +0000
commit6c311041c1d3d0b9d1fc6ddacd49e50d83ba158a (patch)
treee3b1e8c3ad42b5139f7c50e29ac10014c501039f /sound/soc
parent370a0314ff3e1315e7fdec32a88a7ae49ccd22c8 (diff)
downloadlinux-stable-6c311041c1d3d0b9d1fc6ddacd49e50d83ba158a.tar.gz
linux-stable-6c311041c1d3d0b9d1fc6ddacd49e50d83ba158a.tar.bz2
linux-stable-6c311041c1d3d0b9d1fc6ddacd49e50d83ba158a.zip
ASoC: twl6040: Restore bias level at resume
This patch restores the CODEC bias level at resume(). Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/twl6040.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index b575fd3ba3fb..3973bf6889c0 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -1097,6 +1097,7 @@ static int twl6040_suspend(struct snd_soc_codec *codec, pm_message_t state)
static int twl6040_resume(struct snd_soc_codec *codec)
{
twl6040_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+ twl6040_set_bias_level(codec, codec->dapm.suspend_bias_level);
return 0;
}