]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
HID: asus: change mapping from KEY_WLAN to KEY_RFKILL
authorMatjaz Hegedic <matjaz.hegedic@gmail.com>
Wed, 8 Mar 2017 23:31:15 +0000 (00:31 +0100)
committerJiri Kosina <jkosina@suse.cz>
Thu, 30 Mar 2017 09:16:53 +0000 (11:16 +0200)
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>
drivers/hid/hid-asus.c

index e0de54b4f499dcf92e08fb5696ddb56d58d27630..bacba97668bff0f4bd237f750adac29626f9153f 100644 (file)
@@ -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;