From df95e21a153d235c838675743dfbd23370685040 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Thu, 10 Feb 2011 15:37:14 -0700 Subject: [PATCH] --- yaml --- r: 233545 b: refs/heads/master c: 3088e3b4963d26d6f6f54987f595b974ed6d48d8 h: refs/heads/master i: 233543: 25c92c1a6563f8f141d9436610a378a9b79d0b13 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8903.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9862d9648715..dfaa208a4761 100644 --- 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 index 987476a5895f..017d99ceb42e 100644 --- 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,