[PATCH] HID: input: Fix parsing of HID_CP_CONSUMER_CONTROL fields

[PATCH] HID: input: Fix parsing of HID_CP_CONSUMER_CONTROL fields

[Hans de Goede]

Fix parsing of HID_CP_CONSUMER_CONTROL fields which are not in
the HID_CP_PROGRAMMABLEBUTTONS collection.

Fixes: bcfa8d14570d ("HID: input: Add support for Programmable Buttons")
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=2018096
Cc: Thomas Weißschuh <linux@weissschuh.net>
Suggested-by: Benjamin Tissoires <btissoir@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/hid/hid-input.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 4b5ebeacd283..4b3f4a5e2305 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -650,10 +650,9 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 						code += KEY_MACRO1;
 					else
 						code += BTN_TRIGGER_HAPPY - 0x1e;
-				} else {
-					goto ignore;
+					break;
 				}
-				break;
+				fallthrough;
 		default:
 			switch (field->physical) {
 			case HID_GD_MOUSE:
-- 
2.31.1

Re: [PATCH] HID: input: Fix parsing of HID_CP_CONSUMER_CONTROL fields

[Thomas Weißschuh]

On 2021-10-28 18:33+0200, Hans de Goede wrote:
> Fix parsing of HID_CP_CONSUMER_CONTROL fields which are not in
> the HID_CP_PROGRAMMABLEBUTTONS collection.
> 
> Fixes: bcfa8d14570d ("HID: input: Add support for Programmable Buttons")
> BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=2018096
> Cc: Thomas Weißschuh <linux@weissschuh.net>
> Suggested-by: Benjamin Tissoires <btissoir@redhat.com>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
>  drivers/hid/hid-input.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
> index 4b5ebeacd283..4b3f4a5e2305 100644
> --- a/drivers/hid/hid-input.c
> +++ b/drivers/hid/hid-input.c
> @@ -650,10 +650,9 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
>  						code += KEY_MACRO1;
>  					else
>  						code += BTN_TRIGGER_HAPPY - 0x1e;
> -				} else {
> -					goto ignore;
> +					break;
>  				}
> -				break;
> +				fallthrough;
>  		default:
>  			switch (field->physical) {
>  			case HID_GD_MOUSE:
> -- 
> 2.31.1

Reviewed-By: Thomas Weißschuh <linux@weissschuh.net>

Although looking at the descriptor I'm not sure that what it does is correct.

FYI I have another patch in the pipeline that fixes broken keymap remapping for
ignored keys.
Such a remapping via the hwdb would have been another, maybe more correct, way
to fix this issue.

Re: [PATCH] HID: input: Fix parsing of HID_CP_CONSUMER_CONTROL fields

[Jiri Kosina]

On Thu, 28 Oct 2021, Hans de Goede wrote:

> Fix parsing of HID_CP_CONSUMER_CONTROL fields which are not in
> the HID_CP_PROGRAMMABLEBUTTONS collection.
> 
> Fixes: bcfa8d14570d ("HID: input: Add support for Programmable Buttons")
> BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=2018096
> Cc: Thomas Weißschuh <linux@weissschuh.net>
> Suggested-by: Benjamin Tissoires <btissoir@redhat.com>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Applied, thanks Hans.

-- 
Jiri Kosina
SUSE Labs