---

yaml --- r: 233545 b: refs/heads/master c: 3088e3b h: refs/heads/master i: 233543: 25c92c1 v: v3
git-mirror · Feb 13, 2011 · df95e21 · df95e21
1 parent b3251e1
commit df95e21
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28d639f7bd2559e3d6dc10c0316d19154b28a2a4
+refs/heads/master: 3088e3b4963d26d6f6f54987f595b974ed6d48d8
diff --git a/trunk/sound/soc/codecs/wm8903.c b/trunk/sound/soc/codecs/wm8903.c
@@ -1482,7 +1482,7 @@ int wm8903_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
 			    WM8903_MICDET_EINT | WM8903_MICSHRT_EINT,
 			    irq_mask);
 
-	if (det && shrt) {
+	if (det || shrt) {
 		/* Enable mic detection, this may not have been set through
 		 * platform data (eg, if the defaults are OK). */
 		snd_soc_update_bits(codec, WM8903_WRITE_SEQUENCER_0,