Re: [PATCH] HID: hid-input: avoid splitting keyboard, system and consumer controls

[The Cheaterman <the.cheaterman@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 453 bytes --]

Hello,

This breaks userspace. Now XkbLayout in xorg.conf.d is ignored for my
keyboard 0d62:3740 Darfon Electronics Corp. (built into my laptop)

Attached a simple patch that fixes the issue. Obviously, a revert is
probably a better idea ; or even better yet, do the part that was kept
aside to "keep the code simple".

Given this is happening on a consumer laptop (Alienware m15 R6), I'm
probably not the only one with this issue.

Thanks for reading.

[-- Attachment #2: 0001-fix-keyboard-layout.patch --]
[-- Type: text/x-patch, Size: 596 bytes --]

--- a/hid-input.c	2022-02-08 22:56:10.850000022 +0100
+++ b/hid-input.c	2022-02-08 22:56:15.737021611 +0100
@@ -1904,16 +1904,6 @@
 	list_for_each_entry(hidinput, &hid->inputs, list) {
 		if (hidinput->application == report->application)
 			return hidinput;
-
-		/*
-		 * Keep SystemControl and ConsumerControl applications together
-		 * with the main keyboard, if present.
-		 */
-		if ((report->application == HID_GD_SYSTEM_CONTROL ||
-		     report->application == HID_CP_CONSUMER_CONTROL) &&
-		    hidinput->application == HID_GD_KEYBOARD) {
-			return hidinput;
-		}
 	}
 
 	return NULL;