summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorMatjaz Hegedic <matjaz.hegedic@gmail.com>2017-03-09 00:31:15 +0100
committerJiri Kosina <jkosina@suse.cz>2017-03-30 11:16:53 +0200
commit802b24b475e459e985681d6e0815ae6cb52e5560 (patch)
tree17218907e84aa44a14bb8d694c41251241e67e40 /drivers/hid
parent0485b1ec280cb9b2b6ed6e44e999294b4c698182 (diff)
downloadtalos-obmc-linux-802b24b475e459e985681d6e0815ae6cb52e5560.tar.gz
talos-obmc-linux-802b24b475e459e985681d6e0815ae6cb52e5560.zip
HID: asus: change mapping from KEY_WLAN to KEY_RFKILL
The input mapping code incorrectly maps the Airplane Mode button to KEY_WLAN, which stands for WiFi toggle, but doesn't affect Bluetooth (and other active radios) which is expected behavior for Airplane Mode. The fix replaces KEY_WLAN with the more appropriate KEY_RFKILL. The declared usage code 0x88 corresponds to Airplane Mode button on all keyboards handled by hid-asus (I2C netbook keyboards and USB RoG series keyboards), so the fix doesn't introduce any inconsistencies across different models. Signed-off-by: Matjaz Hegedic <matjaz.hegedic@gmail.com> Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-asus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
index e0de54b4f499..bacba97668bf 100644
--- a/drivers/hid/hid-asus.c
+++ b/drivers/hid/hid-asus.c
@@ -226,7 +226,7 @@ static int asus_input_mapping(struct hid_device *hdev,
case 0x35: asus_map_key_clear(KEY_DISPLAY_OFF); break;
case 0x6c: asus_map_key_clear(KEY_SLEEP); break;
case 0x82: asus_map_key_clear(KEY_CAMERA); break;
- case 0x88: asus_map_key_clear(KEY_WLAN); break;
+ case 0x88: asus_map_key_clear(KEY_RFKILL); break;
case 0xb5: asus_map_key_clear(KEY_CALC); break;
case 0xc4: asus_map_key_clear(KEY_KBDILLUMUP); break;
case 0xc5: asus_map_key_clear(KEY_KBDILLUMDOWN); break;
OpenPOWER on IntegriCloud