Skip to content

Commit e91b496

Browse files
author
Jiri Kosina
committed
Merge branch 'for-6.14/core' into for-linus
- hid-core fix for long-standing cornercase of Resolution Multiplier not being present in any of the Logical Collections in the device HID report descriptor (Alan Stern)
2 parents 670af65 + 64f2657 commit e91b496

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/hid/hid-core.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,6 +1163,8 @@ static void hid_apply_multiplier(struct hid_device *hid,
11631163
while (multiplier_collection->parent_idx != -1 &&
11641164
multiplier_collection->type != HID_COLLECTION_LOGICAL)
11651165
multiplier_collection = &hid->collection[multiplier_collection->parent_idx];
1166+
if (multiplier_collection->type != HID_COLLECTION_LOGICAL)
1167+
multiplier_collection = NULL;
11661168

11671169
effective_multiplier = hid_calculate_multiplier(hid, multiplier);
11681170

0 commit comments

Comments
 (0)