---

yaml --- r: 230347 b: refs/heads/master c: 1badabd h: refs/heads/master i: 230345: 005fe94 230343: 8b76c6c v: v3
git-mirror · Dec 6, 2010 · d4aed4a · d4aed4a
1 parent 9c600cf
commit d4aed4a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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);