Merge branch 'for-3.0' into for-3.1

47d90a03 · Mark Brown · 58499906 · b35e160a · 47d90a03
Commit 47d90a03 authored Jul 15, 2011 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/codecs/wm8994.c sound/soc/codecs/wm8994.c +1 -1

No files found.
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2788,7 +2788,7 @@ static void wm8958_default_micdet(u16 status, void *data)
 	report = SND_JACK_MICROPHONE;

 	/* Everything else is buttons; just assign slots */
-	if (status & 0x1c0)
+	if (status & 0x1c)
 		report |= SND_JACK_BTN_0;

 done: