diff options
-rw-r--r-- | drivers/hid/hid-elecom.c | 4 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
-rw-r--r-- | drivers/hid/hid-quirks.c | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/drivers/hid/hid-elecom.c b/drivers/hid/hid-elecom.c index 21e15dc91aac..ae8e9413c79d 100644 --- a/drivers/hid/hid-elecom.c +++ b/drivers/hid/hid-elecom.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * HID driver for ELECOM devices: | 2 | * HID driver for ELECOM devices: |
3 | * - BM084 Bluetooth Mouse | 3 | * - BM084 Bluetooth Mouse |
4 | * - EX-G Trackballs (M-XT3DRBK, M-XT3URBK) | 4 | * - EX-G Trackballs (M-XT3DRBK, M-XT3URBK, M-XT4DRBK) |
5 | * - DEFT Trackballs (M-DT1DRBK, M-DT1URBK, M-DT2DRBK, M-DT2URBK) | 5 | * - DEFT Trackballs (M-DT1DRBK, M-DT1URBK, M-DT2DRBK, M-DT2URBK) |
6 | * - HUGE Trackballs (M-HT1DRBK, M-HT1URBK) | 6 | * - HUGE Trackballs (M-HT1DRBK, M-HT1URBK) |
7 | * | 7 | * |
@@ -67,6 +67,7 @@ static __u8 *elecom_report_fixup(struct hid_device *hdev, __u8 *rdesc, | |||
67 | break; | 67 | break; |
68 | case USB_DEVICE_ID_ELECOM_M_XT3URBK: | 68 | case USB_DEVICE_ID_ELECOM_M_XT3URBK: |
69 | case USB_DEVICE_ID_ELECOM_M_XT3DRBK: | 69 | case USB_DEVICE_ID_ELECOM_M_XT3DRBK: |
70 | case USB_DEVICE_ID_ELECOM_M_XT4DRBK: | ||
70 | mouse_button_fixup(hdev, rdesc, *rsize, 6); | 71 | mouse_button_fixup(hdev, rdesc, *rsize, 6); |
71 | break; | 72 | break; |
72 | case USB_DEVICE_ID_ELECOM_M_DT1URBK: | 73 | case USB_DEVICE_ID_ELECOM_M_DT1URBK: |
@@ -83,6 +84,7 @@ static const struct hid_device_id elecom_devices[] = { | |||
83 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) }, | 84 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) }, |
84 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK) }, | 85 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK) }, |
85 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3DRBK) }, | 86 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3DRBK) }, |
87 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT4DRBK) }, | ||
86 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_DT1URBK) }, | 88 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_DT1URBK) }, |
87 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_DT1DRBK) }, | 89 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_DT1DRBK) }, |
88 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1URBK) }, | 90 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1URBK) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 830c022c3624..c8902f2f0e23 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -373,6 +373,7 @@ | |||
373 | #define USB_DEVICE_ID_ELECOM_BM084 0x0061 | 373 | #define USB_DEVICE_ID_ELECOM_BM084 0x0061 |
374 | #define USB_DEVICE_ID_ELECOM_M_XT3URBK 0x00fb | 374 | #define USB_DEVICE_ID_ELECOM_M_XT3URBK 0x00fb |
375 | #define USB_DEVICE_ID_ELECOM_M_XT3DRBK 0x00fc | 375 | #define USB_DEVICE_ID_ELECOM_M_XT3DRBK 0x00fc |
376 | #define USB_DEVICE_ID_ELECOM_M_XT4DRBK 0x00fd | ||
376 | #define USB_DEVICE_ID_ELECOM_M_DT1URBK 0x00fe | 377 | #define USB_DEVICE_ID_ELECOM_M_DT1URBK 0x00fe |
377 | #define USB_DEVICE_ID_ELECOM_M_DT1DRBK 0x00ff | 378 | #define USB_DEVICE_ID_ELECOM_M_DT1DRBK 0x00ff |
378 | #define USB_DEVICE_ID_ELECOM_M_HT1URBK 0x010c | 379 | #define USB_DEVICE_ID_ELECOM_M_HT1URBK 0x010c |
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c index 9675cd500776..91049dff301f 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c | |||
@@ -337,6 +337,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
337 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) }, | 337 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) }, |
338 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK) }, | 338 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3URBK) }, |
339 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3DRBK) }, | 339 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT3DRBK) }, |
340 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_XT4DRBK) }, | ||
340 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_DT1URBK) }, | 341 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_DT1URBK) }, |
341 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_DT1DRBK) }, | 342 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_DT1DRBK) }, |
342 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1URBK) }, | 343 | { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1URBK) }, |