system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-20 19:17:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-3.0' into for-3.1

Browse source
This commit is contained in:
Mark Brown 2011-07-15 22:43:07 +09:00
parent 58499906c8 b35e160a11
commit 47d90a03eb
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sound/soc/codecs/wm8994.c
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: