]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Revert "HID: hid-asus.c: Maps key 0x35 (display off) to KEY_SCREENLOCK"
authorVinícius Angiolucci Reis <angiolucci@gmail.com>
Thu, 11 Nov 2021 22:47:35 +0000 (19:47 -0300)
committerJiri Kosina <jkosina@suse.cz>
Fri, 12 Nov 2021 10:28:18 +0000 (11:28 +0100)
This reverts commit 8ea87b195143e19312eb206924a5538cba3403a1.

As Dmitry Torokhov pointed out, the previous code (KEY_DISPLAY_OFF) is
actually correct. The real issue is that current desktop environments
don't deal it properly. Mapping it to another event does not solve the
issue.

So I'm reverting that change, keeping key 0x35 mapped to KEY_DISPLAY_OFF

Signed-off-by: Vinícius Angiolucci Reis <angiolucci@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-asus.c

index 5d57214d8dee4aedea057128a7c5fdf5c2df64d7..f3ecddc519ee8c220f45f4315ec984677688cc26 100644 (file)
@@ -854,7 +854,7 @@ static int asus_input_mapping(struct hid_device *hdev,
                switch (usage->hid & HID_USAGE) {
                case 0x10: asus_map_key_clear(KEY_BRIGHTNESSDOWN);      break;
                case 0x20: asus_map_key_clear(KEY_BRIGHTNESSUP);                break;
-               case 0x35: asus_map_key_clear(KEY_SCREENLOCK);          break;
+               case 0x35: asus_map_key_clear(KEY_DISPLAY_OFF);         break;
                case 0x6c: asus_map_key_clear(KEY_SLEEP);               break;
                case 0x7c: asus_map_key_clear(KEY_MICMUTE);             break;
                case 0x82: asus_map_key_clear(KEY_CAMERA);              break;