History

Merge tag 'platform-drivers-x86-v4.13-4' of git://git.infradead.org/linux-platform-drivers-x86

Pull x86 platform driver fix from Darren Hart: "Fix loop preventing some platforms from waking up via the power button in s2idle: - intel-vbtn: match power button on press rather than release" * tag 'platform-drivers-x86-v4.13-4' of git://git.infradead.org/linux-platform-drivers-x86: platform/x86: intel-vbtn: match power button on press rather than release

Linus Torvalds committed 9 years ago

Commit acdae9e2 parents ed66da1 946da691 file · +2 −2Browse files

Unified · Split

drivers/platform/x86/intel-vbtn.c+2−2
@@ -36,8 +36,8 @@ static const struct acpi_device_id intel_vbtn_ids[] = { · 35 unmodified lines
3636
3737 /* In theory, these are HID usages. */
3838 static const struct key_entry intel_vbtn_keymap[] = {
39− { KE_IGNORE, 0xC0, { KEY_POWER } }, /* power key press */
40− { KE_KEY, 0xC1, { KEY_POWER } }, /* power key release */
39+ { KE_KEY, 0xC0, { KEY_POWER } }, /* power key press */
40+ { KE_IGNORE, 0xC1, { KEY_POWER } }, /* power key release */
4141 { KE_KEY, 0xC4, { KEY_VOLUMEUP } }, /* volume-up key press */
4242 { KE_IGNORE, 0xC5, { KEY_VOLUMEUP } }, /* volume-up key release */
4343 { KE_KEY, 0xC6, { KEY_VOLUMEDOWN } }, /* volume-down key press */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t