From: Hans de Goede Date: Thu, 28 Oct 2021 16:33:30 +0000 (+0200) Subject: HID: input: Fix parsing of HID_CP_CONSUMER_CONTROL fields X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7fc48fd6b2c0acacd8130d83d2a037670d6192d2;p=linux.git HID: input: Fix parsing of HID_CP_CONSUMER_CONTROL fields 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 Suggested-by: Benjamin Tissoires Signed-off-by: Hans de Goede Reviewed-By: Thomas Weißschuh Signed-off-by: Jiri Kosina --- diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 2c72ce4147b17..92e87992b586e 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: