Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 04:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

hid-for-linus-2023121201

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIVAwUAZXji4KZi849r7WBJAQKOXhAApTeEWwONuprA4bT5mwi2CAhYmiqmJI2H
 VbFBe8HX0f/Mrupp/E39/m2kCSNKq633iXC7XQT4XnvyhQQPEmPYISCd1ULogx0c
 Jb9XRqM3OjZzmEbk4AaL7cZKRS1LOLERoJ5BSytQ3i8+KbjjCVieO4r/Hk3qfoGd
 bJgtP5IxCwGE7ByOpz2OaRFOstrj3knrpnqEM8UgRkqfymzPVOHisBm06URcFA3B
 ARJ+Mc/rl1niuWwAWWWAQNbPvHS1nxz4KxUtRGbgKfoSx3ungMd5EC5/1K16eopk
 p+26Lv5dq7x/kmy2cMZUBr0DI+QeR2LHsiIMVQOtVu5FZ7b8Z45fKqFOZFbWHq/l
 YDGHJu9fDPMbfSZrSMT5KNEqW1Epqe0wHvDLr94lICkvhxiDNAWQnxAda3u/2vIV
 o42q7yXrxH3JM/RcBIeFKfb236ZAGfSdEmCGqcRNllWoNJMWH85TG/i1WcWho9tT
 GuP64fODIbMafqn4MoO9zNnmVGrXC8yLyYo2RvASt7wv/JM7vu6zUKQd4tsBL3P2
 WhnL1YRHBtwADtwN77rGGo4zhq2uh57iDRFHr/PefEBSW2yCPf3Ba9C5iBMsIDr7
 mRbuP/88NxwUNBCy+a4QyKROExSUwLTPyQOGIofIPxl1BqjaEnEaMTkQdfzjtuiT
 OUg/yR3G8sU=
 =CC6N
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2023-12-12 17:02:56 -08:00
commit 88035e5694
6 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.mailmap
View File

@ -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>

2
drivers/hid/hid-apple.c
View File

@ -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)

1
drivers/hid/hid-ids.h
View File

@ -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

3
drivers/hid/hid-lenovo.c
View File

@ -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;

1
drivers/hid/hid-quirks.c
View File

@ -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 },

5
drivers/hid/i2c-hid/i2c-hid-acpi.c
View File

@ -40,6 +40,11 @@ static const struct acpi_device_id i2c_hid_acpi_blacklist[] = {
* ICN8505 controller, has a _CID of PNP0C50 but is not HID compatible.
*/
{ "CHPN0001" },
/*
* The IDEA5002 ACPI device causes high interrupt usage and spurious
* wakeups from suspend.
*/
{ "IDEA5002" },
{ }
};