diff options
| -rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-sjoy.c | 6 |
3 files changed, 6 insertions, 2 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 162be0955df0..e89e4c7360c6 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
| @@ -1550,6 +1550,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
| 1550 | { HID_USB_DEVICE(USB_VENDOR_ID_UNITEC, USB_DEVICE_ID_UNITEC_USB_TOUCH_0709) }, | 1550 | { HID_USB_DEVICE(USB_VENDOR_ID_UNITEC, USB_DEVICE_ID_UNITEC_USB_TOUCH_0709) }, |
| 1551 | { HID_USB_DEVICE(USB_VENDOR_ID_UNITEC, USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) }, | 1551 | { HID_USB_DEVICE(USB_VENDOR_ID_UNITEC, USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) }, |
| 1552 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) }, | 1552 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) }, |
| 1553 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SUPER_JOY_BOX_3) }, | ||
| 1553 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD) }, | 1554 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD) }, |
| 1554 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_JOY_BOX_3_PRO) }, | 1555 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_JOY_BOX_3_PRO) }, |
| 1555 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_DUAL_BOX_PRO) }, | 1556 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_DUAL_BOX_PRO) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 526a8b276338..6de95422586a 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -717,6 +717,7 @@ | |||
| 717 | #define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101 | 717 | #define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101 |
| 718 | #define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104 | 718 | #define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104 |
| 719 | #define USB_DEVICE_ID_8_8_4_IF_KIT 0x8201 | 719 | #define USB_DEVICE_ID_8_8_4_IF_KIT 0x8201 |
| 720 | #define USB_DEVICE_ID_SUPER_JOY_BOX_3 0x8888 | ||
| 720 | #define USB_DEVICE_ID_QUAD_USB_JOYPAD 0x8800 | 721 | #define USB_DEVICE_ID_QUAD_USB_JOYPAD 0x8800 |
| 721 | #define USB_DEVICE_ID_DUAL_USB_JOYPAD 0x8866 | 722 | #define USB_DEVICE_ID_DUAL_USB_JOYPAD 0x8866 |
| 722 | 723 | ||
diff --git a/drivers/hid/hid-sjoy.c b/drivers/hid/hid-sjoy.c index 4b1448613ea6..42257acfeb73 100644 --- a/drivers/hid/hid-sjoy.c +++ b/drivers/hid/hid-sjoy.c | |||
| @@ -155,7 +155,8 @@ err: | |||
| 155 | } | 155 | } |
| 156 | 156 | ||
| 157 | static const struct hid_device_id sjoy_devices[] = { | 157 | static const struct hid_device_id sjoy_devices[] = { |
| 158 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_JOY_BOX_3_PRO) }, | 158 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_JOY_BOX_3_PRO), |
| 159 | .driver_data = HID_QUIRK_NOGET }, | ||
| 159 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_DUAL_BOX_PRO), | 160 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_DUAL_BOX_PRO), |
| 160 | .driver_data = HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET | | 161 | .driver_data = HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET | |
| 161 | HID_QUIRK_SKIP_OUTPUT_REPORTS }, | 162 | HID_QUIRK_SKIP_OUTPUT_REPORTS }, |
| @@ -163,8 +164,9 @@ static const struct hid_device_id sjoy_devices[] = { | |||
| 163 | .driver_data = HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET | | 164 | .driver_data = HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET | |
| 164 | HID_QUIRK_SKIP_OUTPUT_REPORTS }, | 165 | HID_QUIRK_SKIP_OUTPUT_REPORTS }, |
| 165 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) }, | 166 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) }, |
| 167 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SUPER_JOY_BOX_3) }, | ||
| 166 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD), | 168 | { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD), |
| 167 | .driver_data = HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET | | 169 | .driver_data = HID_QUIRK_MULTI_INPUT | |
| 168 | HID_QUIRK_SKIP_OUTPUT_REPORTS }, | 170 | HID_QUIRK_SKIP_OUTPUT_REPORTS }, |
| 169 | { } | 171 | { } |
| 170 | }; | 172 | }; |
