mirror of
https://github.com/torvalds/linux.git
synced 2025-01-01 07:42:07 +00:00
Merge branch 'for-3.0' into for-3.1
This commit is contained in:
commit
47d90a03eb
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user