From 18300a1afdcd4ba9522fe866e34b3eaa9d3f8609 Mon Sep 17 00:00:00 2001
From: "Olaya, Margarita" <magi.olaya@ti.com>
Date: Fri, 10 Dec 2010 21:05:46 -0600
Subject: [PATCH] --- yaml --- r: 230409 b: refs/heads/master c:
 6c311041c1d3d0b9d1fc6ddacd49e50d83ba158a h: refs/heads/master i:   230407:
 bb0f5e927a695bcb6b431d5c409b82805c99ea8a v: v3

---
 [refs]                           | 2 +-
 trunk/sound/soc/codecs/twl6040.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7b212574b0a7..d689af50c67a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 370a0314ff3e1315e7fdec32a88a7ae49ccd22c8
+refs/heads/master: 6c311041c1d3d0b9d1fc6ddacd49e50d83ba158a
diff --git a/trunk/sound/soc/codecs/twl6040.c b/trunk/sound/soc/codecs/twl6040.c
index b575fd3ba3fb..3973bf6889c0 100644
--- a/trunk/sound/soc/codecs/twl6040.c
+++ b/trunk/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;
 }