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
Unified · Split
| @@ -36,8 +36,8 @@ static const struct acpi_device_id intel_vbtn_ids[] = { · 35 unmodified lines | |||
| 36 | 36 | ||
| 37 | /* In theory, these are HID usages. */ | 37 | /* In theory, these are HID usages. */ |
| 38 | static const struct key_entry intel_vbtn_keymap[] = { | 38 | static const struct key_entry intel_vbtn_keymap[] = { |
| 39 | { KE_IGNORE, 0xC0, { KEY_POWER } }, /* power key press */ | 39 | { KE_KEY, 0xC0, { KEY_POWER } }, /* power key press */ |
| 40 | { KE_KEY, 0xC1, { KEY_POWER } }, /* power key release */ | 40 | { KE_IGNORE, 0xC1, { KEY_POWER } }, /* power key release */ |
| 41 | { KE_KEY, 0xC4, { KEY_VOLUMEUP } }, /* volume-up key press */ | 41 | { KE_KEY, 0xC4, { KEY_VOLUMEUP } }, /* volume-up key press */ |
| 42 | { KE_IGNORE, 0xC5, { KEY_VOLUMEUP } }, /* volume-up key release */ | 42 | { KE_IGNORE, 0xC5, { KEY_VOLUMEUP } }, /* volume-up key release */ |
| 43 | { KE_KEY, 0xC6, { KEY_VOLUMEDOWN } }, /* volume-down key press */ | 43 | { KE_KEY, 0xC6, { KEY_VOLUMEDOWN } }, /* volume-down key press */ |