Merge branch 'for-3.0' into for-3.1

2011-07-15 22:43:07 +09:00 · 2011-07-15 22:43:07 +09:00 · 47d90a03eb
--- 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: