| Message ID | 20211111224735.29665-1-angiolucci@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | e3d9234f3002bb23eb021f6d317e037b5487d4d0 |
| Delegated to: | Jiri Kosina |
| Headers | show |
| Series | Revert "HID: hid-asus.c: Maps key 0x35 (display off) to KEY_SCREENLOCK" | expand |
On Thu, 11 Nov 2021, Vinícius Angiolucci Reis wrote: > This reverts commit 2ea5999d07d2a0ab6ad92ccf65524707f2c5e456. > > 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> Queued for 5.16-rc, thanks.
diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index 5d57214d8dee..f3ecddc519ee 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -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;
This reverts commit 2ea5999d07d2a0ab6ad92ccf65524707f2c5e456. 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> --- drivers/hid/hid-asus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)