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)
This commit is contained in:
Jiri Kosina 2025-01-20 09:59:16 +01:00
commit e91b496e9c

View File

@ -1163,6 +1163,8 @@ static void hid_apply_multiplier(struct hid_device *hid,
while (multiplier_collection->parent_idx != -1 &&
multiplier_collection->type != HID_COLLECTION_LOGICAL)
multiplier_collection = &hid->collection[multiplier_collection->parent_idx];
if (multiplier_collection->type != HID_COLLECTION_LOGICAL)
multiplier_collection = NULL;
effective_multiplier = hid_calculate_multiplier(hid, multiplier);