---

yaml --- r: 287332 b: refs/heads/master c: a7c4183 h: refs/heads/master v: v3
git-mirror · Feb 8, 2012 · 1ff3814 · 1ff3814
1 parent 27df306
commit 1ff3814
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: f647e1526fd6c7c8ab720781c40d11e11f930e93
+refs/heads/master: a7c4183be2d6a7da8c97a9b671b5f3aed321127e
diff --git a/trunk/sound/soc/codecs/wm8994.c b/trunk/sound/soc/codecs/wm8994.c
@@ -787,6 +787,11 @@ static void vmid_reference(struct snd_soc_codec *codec)
 				    WM8994_VMID_BUF_ENA |
 				    (0x3 << WM8994_VMID_RAMP_SHIFT));
 
+		/* Remove discharge for line out */
+		snd_soc_update_bits(codec, WM8994_ANTIPOP_1,
+				    WM8994_LINEOUT1_DISCH |
+				    WM8994_LINEOUT2_DISCH, 0);
+
 		/* Main bias enable, VMID=2x40k */
 		snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1,
 				    WM8994_BIAS_ENA |