From: Hans de Goede <hdegoede@redhat.com>
Date: Thu, 28 Oct 2021 16:33:30 +0000 (+0200)
Subject: HID: input: Fix parsing of HID_CP_CONSUMER_CONTROL fields
X-Git-Tag: baikal/mips/sdk5.9~8451
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=f102daac12ee2432d654539042b277c311e524ae;p=kernel.git

HID: input: Fix parsing of HID_CP_CONSUMER_CONTROL fields

[ Upstream commit 97ee38687c60e0a130f39dc7f83bca420c9721e1 ]

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

Fixes: 0623a1bab70c ("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>
Reviewed-By: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 4b5ebeacd2836..4b3f4a5e23058 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: