From aec124b053957858263832ce65438636a578e83c Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 22 Aug 2011 18:40:30 +0100
Subject: [PATCH] --- yaml --- r: 270538 b: refs/heads/master c:
 33c5f969b969c277e96cd9e9bf8472c4b8709c25 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ab05cbc14efc..f81b9e7037b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1661699aaa64e6024770ea7adff4fc6216cb25ca
+refs/heads/master: 33c5f969b969c277e96cd9e9bf8472c4b8709c25
diff --git a/trunk/include/sound/soc.h b/trunk/include/sound/soc.h
index 3fe658eea28b..6da55a17fcfd 100644
--- a/trunk/include/sound/soc.h
+++ b/trunk/include/sound/soc.h
@@ -633,6 +633,7 @@ struct snd_soc_codec_driver {
 	/* codec bias level */
 	int (*set_bias_level)(struct snd_soc_codec *,
 			      enum snd_soc_bias_level level);
+	bool idle_bias_off;
 
 	void (*seq_notifier)(struct snd_soc_dapm_context *,
 			     enum snd_soc_dapm_type, int);
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index ae93aa81244c..f8f985a4f2a8 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/sound/soc/soc-core.c
@@ -956,6 +956,8 @@ static int soc_probe_codec(struct snd_soc_card *card,
 		snd_soc_dapm_new_controls(&codec->dapm, driver->dapm_widgets,
 					  driver->num_dapm_widgets);
 
+	codec->dapm.idle_bias_off = driver->idle_bias_off;
+
 	if (driver->probe) {
 		ret = driver->probe(codec);
 		if (ret < 0) {