Commit 88035e56 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hid-for-linus-2023121201' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid 

Pull HID fixes from Jiri Kosina:

 - Lenovo ThinkPad TrackPoint Keyboard II firmware-specific regression
   fix (Mikhail Khvainitski)

 - device-specific fixes (various authors)

* tag 'hid-for-linus-2023121201' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: apple: Add "hfd.cn" and "WKB603" to the list of non-apple keyboards
  HID: lenovo: Restrict detection of patched firmware only to USB cptkbd
  HID: Add quirk for Labtec/ODDOR/aikeec handbrake
  HID: i2c-hid: Add IDEA5002 to i2c_hid_acpi_blacklist[]
  mailmap: add address mapping for Jiri Kosina
parents cf52eed7 df83a0df

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -266,6 +266,9 @@ Jens Osterkamp <Jens.Osterkamp@de.ibm.com> 
Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>

Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>

Jilai Wang <quic_jilaiw@quicinc.com> <jilaiw@codeaurora.org>

Jiri Kosina <jikos@kernel.org> <jikos@jikos.cz>

Jiri Kosina <jikos@kernel.org> <jkosina@suse.cz>

Jiri Kosina <jikos@kernel.org> <jkosina@suse.com>

Jiri Pirko <jiri@resnulli.us> <jiri@nvidia.com>

Jiri Pirko <jiri@resnulli.us> <jiri@mellanox.com>

Jiri Pirko <jiri@resnulli.us> <jpirko@redhat.com>

drivers/hid/hid-apple.c

+2 −0
Original line number Diff line number Diff line
@@ -347,6 +347,8 @@ static const struct apple_non_apple_keyboard non_apple_keyboards[] = { 
	{ "Hailuck" },

	{ "Jamesdonkey" },

	{ "A3R" },

	{ "hfd.cn" },

	{ "WKB603" },

};



static bool apple_is_non_apple_keyboard(struct hid_device *hdev)

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -740,6 +740,7 @@ 


#define USB_VENDOR_ID_LABTEC		0x1020

#define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD	0x0006

#define USB_DEVICE_ID_LABTEC_ODDOR_HANDBRAKE	0x8888



#define USB_VENDOR_ID_LAVIEW		0x22D4

#define USB_DEVICE_ID_GLORIOUS_MODEL_I	0x1503

drivers/hid/hid-lenovo.c

+2 −1
Original line number Diff line number Diff line
@@ -692,7 +692,8 @@ static int lenovo_event_cptkbd(struct hid_device *hdev, 
		 * so set middlebutton_state to 3

		 * to never apply workaround anymore

		 */

		if (cptkbd_data->middlebutton_state == 1 &&

		if (hdev->product == USB_DEVICE_ID_LENOVO_CUSBKBD &&

				cptkbd_data->middlebutton_state == 1 &&

				usage->type == EV_REL &&

				(usage->code == REL_X || usage->code == REL_Y)) {

			cptkbd_data->middlebutton_state = 3;

drivers/hid/hid-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ static const struct hid_device_id hid_quirks[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M406XE), HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2), HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_PENSKETCH_T609A), HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_ODDOR_HANDBRAKE), HID_QUIRK_ALWAYS_POLL },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_OPTICAL_USB_MOUSE_600E), HID_QUIRK_ALWAYS_POLL },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D), HID_QUIRK_ALWAYS_POLL },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_6019), HID_QUIRK_ALWAYS_POLL },