linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Revert "HID: hid-asus.c: Maps key 0x35 (display off) to KEY_SCREENLOCK"
@ 2021-11-11 22:47 Vinícius Angiolucci Reis
  2021-11-12 10:28 ` Jiri Kosina
  0 siblings, 1 reply; 2+ messages in thread
From: Vinícius Angiolucci Reis @ 2021-11-11 22:47 UTC (permalink / raw)
  To: jikos
  Cc: linux-input, linux-kernel, dmitry.torokhov,
	Vinícius Angiolucci Reis

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(-)

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;
-- 
2.33.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] Revert "HID: hid-asus.c: Maps key 0x35 (display off) to KEY_SCREENLOCK"
  2021-11-11 22:47 [PATCH] Revert "HID: hid-asus.c: Maps key 0x35 (display off) to KEY_SCREENLOCK" Vinícius Angiolucci Reis
@ 2021-11-12 10:28 ` Jiri Kosina
  0 siblings, 0 replies; 2+ messages in thread
From: Jiri Kosina @ 2021-11-12 10:28 UTC (permalink / raw)
  To: Vinícius Angiolucci Reis; +Cc: linux-input, linux-kernel, dmitry.torokhov

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.

-- 
Jiri Kosina
SUSE Labs


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-11-12 10:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-11 22:47 [PATCH] Revert "HID: hid-asus.c: Maps key 0x35 (display off) to KEY_SCREENLOCK" Vinícius Angiolucci Reis
2021-11-12 10:28 ` Jiri Kosina

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).