diff options
| author | Benjamin Tissoires <bentiss@kernel.org> | 2023-08-31 10:49:57 +0200 |
|---|---|---|
| committer | Benjamin Tissoires <bentiss@kernel.org> | 2023-08-31 10:49:57 +0200 |
| commit | 9fe5167a6c2163a3814c24221f0f52363bae06c6 (patch) | |
| tree | c0bd31241ab77b66a0ef8545b14a16abe0c1beea /drivers/hid | |
| parent | 2544f87721f0dccaa9e83a2b850924ec706a1edb (diff) | |
| parent | c4444d8749f696384947192b602718fa310c1caf (diff) | |
| download | linux-9fe5167a6c2163a3814c24221f0f52363bae06c6.tar.gz | |
Merge branch 'for-6.5/upstream-fixes' into for-linus
Apple devices fixes by Nimish Gåtam and Nils Tonnaett
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-apple.c | 3 | ||||
| -rw-r--r-- | drivers/hid/hid-input.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index d7b932925730d..3ca45975c686e 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c @@ -343,7 +343,8 @@ static const struct apple_non_apple_keyboard non_apple_keyboards[] = { { "SONiX USB DEVICE" }, { "Keychron" }, { "AONE" }, - { "GANSS" } + { "GANSS" }, + { "Hailuck" }, }; static bool apple_is_non_apple_keyboard(struct hid_device *hdev) diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 40a5645f8fe81..0235cc1690a10 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -358,6 +358,9 @@ static const struct hid_device_id hid_battery_quirks[] = { { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI), HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, + USB_DEVICE_ID_APPLE_MAGICTRACKPAD), + HID_BATTERY_QUIRK_IGNORE }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084), HID_BATTERY_QUIRK_IGNORE }, |