Merge branch 'for-3.0' into for-3.1

This commit is contained in:
Mark Brown 2011-07-15 22:43:07 +09:00
commit 47d90a03eb
1 changed files with 1 additions and 1 deletions

View File

@ -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: