Skip to content

L
linux
Commit 9fe5167a authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files
Options

Merge branch 'for-6.5/upstream-fixes' into for-linus 

Apple devices fixes by Nimish Gåtam and Nils Tonnaett
parents 2544f877 c4444d87
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
drivers/hid/hid-apple.c
View file @ 9fe5167a
...@@ -343,7 +343,8 @@ static const struct apple_non_apple_keyboard non_apple_keyboards[] = { ...@@ -343,7 +343,8 @@ static const struct apple_non_apple_keyboard non_apple_keyboards[] = {
{ "SONiX USB DEVICE" }, { "SONiX USB DEVICE" },
{ "Keychron" }, { "Keychron" },
{ "AONE" }, { "AONE" },
{ "GANSS" } { "GANSS" },
{ "Hailuck" },
}; };
static bool apple_is_non_apple_keyboard(struct hid_device *hdev) static bool apple_is_non_apple_keyboard(struct hid_device *hdev)
......
drivers/hid/hid-input.c
View file @ 9fe5167a
...@@ -358,6 +358,9 @@ static const struct hid_device_id hid_battery_quirks[] = { ...@@ -358,6 +358,9 @@ static const struct hid_device_id hid_battery_quirks[] = {
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI), USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),
HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE }, 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, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM,
USB_DEVICE_ID_ELECOM_BM084), USB_DEVICE_ID_ELECOM_BM084),
HID_BATTERY_QUIRK_IGNORE }, HID_BATTERY_QUIRK_IGNORE },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7