diff options
| author | Julius Lehmann <lehmanju@devpi.de> | 2026-02-14 22:34:21 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2026-02-24 11:41:21 +0300 |
| commit | 5f3518d77419255f8b12bb23c8ec22acbeb6bc5b (patch) | |
| tree | 537fb54e014e2949fbf14e9be6126a611891fd13 | |
| parent | 97d5c8f5c09a604c4873c8348f58de3cea69a7df (diff) | |
| download | linux-5f3518d77419255f8b12bb23c8ec22acbeb6bc5b.tar.xz | |
HID: magicmouse: fix battery reporting for Apple Magic Trackpad 2
Battery reporting does not work for the Apple Magic Trackpad 2 if it is
connected via USB. The current hid descriptor fixup code checks for a
hid descriptor length of exactly 83 bytes. If the hid descriptor is
larger, which is the case for newer apple mice, the fixup is not
applied.
This fix checks for hid descriptor sizes greater/equal 83 bytes which
applies the fixup for newer devices as well.
Signed-off-by: Julius Lehmann <lehmanju@devpi.de>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
| -rw-r--r-- | drivers/hid/hid-magicmouse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index 17908d52c027..9eadf3252d0d 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c @@ -990,7 +990,7 @@ static const __u8 *magicmouse_report_fixup(struct hid_device *hdev, __u8 *rdesc, */ if ((is_usb_magicmouse2(hdev->vendor, hdev->product) || is_usb_magictrackpad2(hdev->vendor, hdev->product)) && - *rsize == 83 && rdesc[46] == 0x84 && rdesc[58] == 0x85) { + *rsize >= 83 && rdesc[46] == 0x84 && rdesc[58] == 0x85) { hid_info(hdev, "fixing up magicmouse battery report descriptor\n"); *rsize = *rsize - 1; |