From 151bfd3edc7e0f68137b58706a7c285c7af73f4e Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 1 Nov 2011 13:53:37 +0000
Subject: [PATCH] --- yaml --- r: 273573 b: refs/heads/master c:
 2af8de8c39cf58e5a5e40a9d5d71332da98e6ba7 h: refs/heads/master i:   273571:
 7ec9bc10598f6c2071f25756875d63ef2f4e9b34 v: v3

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

diff --git a/[refs] b/[refs]
index 69fa0ba0c264..e90f009655b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f4488abc97c1c27ff029f887944e6a6da1f5733
+refs/heads/master: 2af8de8c39cf58e5a5e40a9d5d71332da98e6ba7
diff --git a/trunk/sound/soc/codecs/wm8962.c b/trunk/sound/soc/codecs/wm8962.c
index 32d931f1122c..a0c895b2d53b 100644
--- a/trunk/sound/soc/codecs/wm8962.c
+++ b/trunk/sound/soc/codecs/wm8962.c
@@ -4035,6 +4035,11 @@ static int wm8962_probe(struct snd_soc_codec *codec)
 	snd_soc_update_bits(codec, WM8962_CLOCKING2,
 			    WM8962_CLKREG_OVD, WM8962_CLKREG_OVD);
 
+	/* Ensure that the oscillator and PLLs are disabled */
+	snd_soc_update_bits(codec, WM8962_PLL2,
+			    WM8962_OSC_ENA | WM8962_PLL2_ENA | WM8962_PLL3_ENA,
+			    0);
+
 	regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);
 
 	if (pdata) {