From: Matjaz Hegedic Date: Wed, 8 Mar 2017 23:31:15 +0000 (+0100) Subject: HID: asus: change mapping from KEY_WLAN to KEY_RFKILL X-Git-Tag: Ubuntu-4.12.0-11.12~1222^2^2~1 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=802b24b475e459e985681d6e0815ae6cb52e5560;p=mirror_ubuntu-artful-kernel.git 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 Reviewed-by: Benjamin Tissoires Signed-off-by: Jiri Kosina --- 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;