From d4aed4a473e8f3b97157a19f05ce34c2d680956a Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sat, 4 Dec 2010 12:41:04 +0000
Subject: [PATCH] --- yaml --- r: 230347 b: refs/heads/master c:
 1badabd980da3bc09933c14970017067940ecd57 h: refs/heads/master i:   230345:
 005fe94ce83f02f4048c2385624a9e622947f916   230343:
 8b76c6c1d75f93b1ac299b27499789ef894c78c1 v: v3

---
 [refs]                     | 2 +-
 trunk/include/sound/soc.h  | 2 ++
 trunk/sound/soc/soc-dapm.c | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0f2fa7b5c0d8..265d0fc3bc19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28216bf48bbe4314a7a02b7c9822dbb26aca530c
+refs/heads/master: 1badabd980da3bc09933c14970017067940ecd57
diff --git a/trunk/include/sound/soc.h b/trunk/include/sound/soc.h
index 0eea08e1bdd5..4abc2f8fe77a 100644
--- a/trunk/include/sound/soc.h
+++ b/trunk/include/sound/soc.h
@@ -632,6 +632,8 @@ struct snd_soc_card {
 	/* callbacks */
 	int (*set_bias_level)(struct snd_soc_card *,
 			      enum snd_soc_bias_level level);
+	int (*set_bias_level_post)(struct snd_soc_card *,
+				   enum snd_soc_bias_level level);
 
 	long pmdown_time;
 
diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c
index 6a29d59dabaf..9af2d8ad0895 100644
--- a/trunk/sound/soc/soc-dapm.c
+++ b/trunk/sound/soc/soc-dapm.c
@@ -162,6 +162,10 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_card *card,
 		else
 			dapm->bias_level = level;
 	}
+	if (ret == 0) {
+		if (card && card->set_bias_level_post)
+			ret = card->set_bias_level_post(card, level);
+	}
 
 	trace_snd_soc_bias_level_done(card, level);