---

yaml --- r: 273573 b: refs/heads/master c: 2af8de8 h: refs/heads/master i: 273571: 7ec9bc1 v: v3
git-mirror · Nov 1, 2011 · 151bfd3 · 151bfd3
1 parent 1014107
commit 151bfd3
Show file tree

Hide file tree

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