---

yaml --- r: 293340 b: refs/heads/master c: e85b26c h: refs/heads/master v: v3
git-mirror · Feb 11, 2012 · c8b7fbb · c8b7fbb
1 parent ffdeb56
commit c8b7fbb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc6d5a8c2b8c1a04c91bac0a5be02e64307518eb
+refs/heads/master: e85b26ce3a4cda67262ae6f7d918a63fd4dc153c
diff --git a/trunk/sound/soc/codecs/wm8994.c b/trunk/sound/soc/codecs/wm8994.c
@@ -838,6 +838,10 @@ static void vmid_dereference(struct snd_soc_codec *codec)
 				    WM8994_BIAS_ENA |
 				    WM8994_VMID_SEL_MASK, 0);
 
+		/* Discharge VMID */
+		snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
+				    WM8994_VMID_DISCH, WM8994_VMID_DISCH);
+
 		/* Discharge line */
 		snd_soc_update_bits(codec, WM8994_ANTIPOP_1,
 				    WM8994_LINEOUT1_DISCH |