HID: corsair: fix mapping of non-keyboard usages

cvuchener · Jiri Kosina · commit e791f7b10213 · 2016-02-23T14:21:19.000+01:00
This fixes a bug where the Volume Up key was ignored because it uses the same usage code as G18. Special Corsair usage codes are in the keyboard page, other pages should be left to the generic driver.

Signed-off-by: Clément Vuchener &lt;clement.vuchener@gmail.com&gt;
Reviewed-by: Benjamin Tissoires &lt;benjamin.tissoires@redhat.com&gt;
Signed-off-by: Jiri Kosina &lt;jkosina@suse.cz&gt;
diff --git a/drivers/hid/hid-corsair.c b/drivers/hid/hid-corsair.c
@@ -595,6 +595,9 @@ static int corsair_input_mapping(struct hid_device *dev,
 {
 	int gkey;
 
+	if ((usage->hid & HID_USAGE_PAGE) != HID_UP_KEYBOARD)
+		return 0;
+
 	gkey = corsair_usage_to_gkey(usage->hid & HID_USAGE);
 	if (gkey != 0) {
 		hid_map_usage_clear(input, usage, bit, max, EV_KEY,

Original file line number	Diff line number	Diff line change
`@@ -595,6 +595,9 @@ static int corsair_input_mapping(struct hid_device *dev,`
`595`	`595`	`{`
`596`	`596`	`int gkey;`
`597`	`597`
	`598`	`+ if ((usage->hid & HID_USAGE_PAGE) != HID_UP_KEYBOARD)`
	`599`	`+ return 0;`
	`600`	`+`
`598`	`601`	`gkey = corsair_usage_to_gkey(usage->hid & HID_USAGE);`
`599`	`602`	`if (gkey != 0) {`
`600`	`603`	`hid_map_usage_clear(input, usage, bit, max, EV_KEY,`