summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-08-06 16:11:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-08-06 16:11:34 -0700
commitacdae9ee6aba82f5bba1fb44325793572db02fbc (patch)
treebe9b5cd9b62d6bbaedad98034203388b21b06604
parented66da1104c44bda233930af49d51742dc02b26b (diff)
parent946da69954485c4da51c785438f98fb13784941a (diff)
downloadlinux-stable-acdae9ee6aba82f5bba1fb44325793572db02fbc.tar.gz
linux-stable-acdae9ee6aba82f5bba1fb44325793572db02fbc.tar.bz2
linux-stable-acdae9ee6aba82f5bba1fb44325793572db02fbc.zip
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
-rw-r--r--drivers/platform/x86/intel-vbtn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c
index 61f106377661..480926786cb8 100644
--- a/drivers/platform/x86/intel-vbtn.c
+++ b/drivers/platform/x86/intel-vbtn.c
@@ -36,8 +36,8 @@ static const struct acpi_device_id intel_vbtn_ids[] = {
/* In theory, these are HID usages. */
static const struct key_entry intel_vbtn_keymap[] = {
- { KE_IGNORE, 0xC0, { KEY_POWER } }, /* power key press */
- { KE_KEY, 0xC1, { KEY_POWER } }, /* power key release */
+ { KE_KEY, 0xC0, { KEY_POWER } }, /* power key press */
+ { KE_IGNORE, 0xC1, { KEY_POWER } }, /* power key release */
{ KE_KEY, 0xC4, { KEY_VOLUMEUP } }, /* volume-up key press */
{ KE_IGNORE, 0xC5, { KEY_VOLUMEUP } }, /* volume-up key release */
{ KE_KEY, 0xC6, { KEY_VOLUMEDOWN } }, /* volume-down key press */