aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/hid/hid-core.c1
-rw-r--r--drivers/hid/hid-holtek-mouse.c3
-rw-r--r--drivers/hid/hid-ids.h1
3 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index b0de25824fb6..23498ccc4c2b 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1715,6 +1715,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
1715 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD) }, 1715 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD) },
1716 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A) }, 1716 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A) },
1717 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) }, 1717 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) },
1718 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A070) },
1718 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A072) }, 1719 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A072) },
1719 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081) }, 1720 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081) },
1720 { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_580) }, 1721 { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_580) },
diff --git a/drivers/hid/hid-holtek-mouse.c b/drivers/hid/hid-holtek-mouse.c
index 0caa676de622..d60fbd0adc0c 100644
--- a/drivers/hid/hid-holtek-mouse.c
+++ b/drivers/hid/hid-holtek-mouse.c
@@ -49,6 +49,7 @@ static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc,
49 } 49 }
50 break; 50 break;
51 case USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A: 51 case USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A:
52 case USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A070:
52 case USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081: 53 case USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081:
53 if (*rsize >= 113 && rdesc[106] == 0xff && rdesc[107] == 0x7f 54 if (*rsize >= 113 && rdesc[106] == 0xff && rdesc[107] == 0x7f
54 && rdesc[111] == 0xff && rdesc[112] == 0x7f) { 55 && rdesc[111] == 0xff && rdesc[112] == 0x7f) {
@@ -65,6 +66,8 @@ static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc,
65static const struct hid_device_id holtek_mouse_devices[] = { 66static const struct hid_device_id holtek_mouse_devices[] = {
66 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, 67 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT,
67 USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) }, 68 USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) },
69 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT,
70 USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A070) },
68 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, 71 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT,
69 USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A) }, 72 USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A) },
70 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, 73 { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT,
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index c1077ba1bde0..436fc19c5ca0 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -455,6 +455,7 @@
455#define USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD 0xa055 455#define USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD 0xa055
456#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A 0xa04a 456#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A 0xa04a
457#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067 0xa067 457#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067 0xa067
458#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A070 0xa070
458#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A072 0xa072 459#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A072 0xa072
459#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081 0xa081 460#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081 0xa081
460 461