diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/input/hid-core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index b9fb9687f926..8ea9c915fbf9 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c | |||
@@ -1507,6 +1507,9 @@ void hid_init_reports(struct hid_device *hid) | |||
1507 | #define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104 | 1507 | #define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104 |
1508 | #define USB_DEVICE_ID_DUAL_USB_JOYPAD 0x8866 | 1508 | #define USB_DEVICE_ID_DUAL_USB_JOYPAD 0x8866 |
1509 | 1509 | ||
1510 | #define USB_VENDOR_ID_WISEGROUP_LTD 0x6677 | ||
1511 | #define USB_DEVICE_ID_SMARTJOY_DUAL_PLUS 0x8802 | ||
1512 | |||
1510 | #define USB_VENDOR_ID_CODEMERCS 0x07c0 | 1513 | #define USB_VENDOR_ID_CODEMERCS 0x07c0 |
1511 | #define USB_DEVICE_ID_CODEMERCS_IOW40 0x1500 | 1514 | #define USB_DEVICE_ID_CODEMERCS_IOW40 0x1500 |
1512 | #define USB_DEVICE_ID_CODEMERCS_IOW24 0x1501 | 1515 | #define USB_DEVICE_ID_CODEMERCS_IOW24 0x1501 |
@@ -1670,6 +1673,7 @@ static const struct hid_blacklist { | |||
1670 | { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET }, | 1673 | { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET }, |
1671 | { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET }, | 1674 | { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET }, |
1672 | { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, | 1675 | { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, |
1676 | { USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, | ||
1673 | 1677 | ||
1674 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE, HID_QUIRK_MIGHTYMOUSE | HID_QUIRK_INVERT_HWHEEL }, | 1678 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE, HID_QUIRK_MIGHTYMOUSE | HID_QUIRK_INVERT_HWHEEL }, |
1675 | { USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 }, | 1679 | { USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 }, |