mirror of
https://github.com/torvalds/linux
synced 2024-09-20 19:17:24 +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;
|
report = SND_JACK_MICROPHONE;
|
||||||
|
|
||||||
/* Everything else is buttons; just assign slots */
|
/* Everything else is buttons; just assign slots */
|
||||||
if (status & 0x1c0)
|
if (status & 0x1c)
|
||||||
report |= SND_JACK_BTN_0;
|
report |= SND_JACK_BTN_0;
|
||||||
|
|
||||||
done:
|
done:
|
||||||
|
|
Loading…
Reference in a new issue