From fdd2721b299897b293a5c4a127ac2c805246be3e Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 29 Feb 2012 16:40:08 +0000
Subject: [PATCH] --- yaml --- r: 293439 b: refs/heads/master c:
 67109cbea1f92d369849dc88b6c9aca0f66c044e h: refs/heads/master i:   293437:
 4bc782873113e2d13029f199a52d69350265c492   293435:
 87d0a31a2de14f8a0d2b80e3676550f160f3325e   293431:
 c324ed9cfe34d8247f0509dcd1bae68a5310ac55   293423:
 4d7d336b8625ddb25a24ecefd10dbde922312c4e   293407:
 f54cd5fbb00be3880ac2651299f4f85ae024f23d   293375:
 d6c68e33d408c728b4c1ab60a0ce4fa249d8a5e4 v: v3

---
 [refs]                           | 2 +-
 trunk/sound/soc/codecs/wm8994.c  | 1 +
 trunk/sound/soc/codecs/wm_hubs.c | 2 +-
 trunk/sound/soc/codecs/wm_hubs.h | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d047488038fe..36dac93bbca4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b16db745b51a1ecd3fd526a2ff35d61f2962bd7f
+refs/heads/master: 67109cbea1f92d369849dc88b6c9aca0f66c044e
diff --git a/trunk/sound/soc/codecs/wm8994.c b/trunk/sound/soc/codecs/wm8994.c
index a567a4d9b5dc..1fef87d6a285 100644
--- a/trunk/sound/soc/codecs/wm8994.c
+++ b/trunk/sound/soc/codecs/wm8994.c
@@ -3535,6 +3535,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
 		wm8994->hubs.dcs_readback_mode = 2;
 		wm8994->hubs.no_series_update = 1;
 		wm8994->hubs.hp_startup_mode = 1;
+		wm8994->hubs.no_cache_class_w = true;
 
 		switch (wm8994->revision) {
 		case 0:
diff --git a/trunk/sound/soc/codecs/wm_hubs.c b/trunk/sound/soc/codecs/wm_hubs.c
index 7cffdd4b70fb..c08d1c2f346f 100644
--- a/trunk/sound/soc/codecs/wm_hubs.c
+++ b/trunk/sound/soc/codecs/wm_hubs.c
@@ -207,7 +207,7 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec)
 
 	/* Save the callibrated offset if we're in class W mode and
 	 * therefore don't have any analogue signal mixed in. */
-	if (hubs->class_w)
+	if (hubs->class_w && !hubs->no_cache_class_w)
 		hubs->class_w_dcs = dcs_cfg;
 }
 
diff --git a/trunk/sound/soc/codecs/wm_hubs.h b/trunk/sound/soc/codecs/wm_hubs.h
index 4140905c7381..5705276f4943 100644
--- a/trunk/sound/soc/codecs/wm_hubs.h
+++ b/trunk/sound/soc/codecs/wm_hubs.h
@@ -30,6 +30,7 @@ struct wm_hubs_data {
 	int series_startup;
 	int no_series_update;
 
+	bool no_cache_class_w;
 	bool class_w;
 	u16 class_w_dcs;