diff options
| author | Xavier Naveira <xnaveira@gmail.com> | 2015-02-10 08:45:18 +0100 |
|---|---|---|
| committer | Darren Hart <dvhart@linux.intel.com> | 2015-02-10 11:18:27 -0800 |
| commit | 67ab62481cf8d82a6bcbc4a8e6e3fd25e39bcba0 (patch) | |
| tree | facee8442f0b23b2d5ccc722fe70535c9343f4cd /drivers/platform | |
| parent | 98fc4ec64a211a9d301172dec2aed08f47964295 (diff) | |
| download | blackbird-op-linux-67ab62481cf8d82a6bcbc4a8e6e3fd25e39bcba0.tar.gz blackbird-op-linux-67ab62481cf8d82a6bcbc4a8e6e3fd25e39bcba0.zip | |
thinkpad_acpi: unhandled hkey event
Pressing Fn+Esc in a Lenovo Thinkpad x240 to lock the Fn keys generates
an unhandled hkey event
Signed-off-by: Xavier Naveira <xnaveira@gmail.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 0e9262b6273a..bccd449d6152 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -196,6 +196,7 @@ enum tpacpi_hkey_event_t { /* Key-related user-interface events */ TP_HKEY_EV_KEY_NUMLOCK = 0x6000, /* NumLock key pressed */ TP_HKEY_EV_KEY_FN = 0x6005, /* Fn key pressed? E420 */ + TP_HKEY_EV_KEY_FN_ESC = 0x6060, /* Fn+Esc key pressed X240 */ /* Thermal events */ TP_HKEY_EV_ALARM_BAT_HOT = 0x6011, /* battery too hot */ @@ -3712,6 +3713,7 @@ static bool hotkey_notify_6xxx(const u32 hkey, case TP_HKEY_EV_KEY_NUMLOCK: case TP_HKEY_EV_KEY_FN: + case TP_HKEY_EV_KEY_FN_ESC: /* key press events, we just ignore them as long as the EC * is still reporting them in the normal keyboard stream */ *send_acpi_ev = false; |
