diff options
-rw-r--r-- | drivers/hid/hid-ids.h | 3 | ||||
-rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 656c015cf790..0ceabbb8e019 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -347,6 +347,9 @@ | |||
347 | #define USB_VENDOR_ID_NEC 0x073e | 347 | #define USB_VENDOR_ID_NEC 0x073e |
348 | #define USB_DEVICE_ID_NEC_USB_GAME_PAD 0x0301 | 348 | #define USB_DEVICE_ID_NEC_USB_GAME_PAD 0x0301 |
349 | 349 | ||
350 | #define USB_VENDOR_ID_NEXTWINDOW 0x1926 | ||
351 | #define USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN 0x0003 | ||
352 | |||
350 | #define USB_VENDOR_ID_NTRIG 0x1b96 | 353 | #define USB_VENDOR_ID_NTRIG 0x1b96 |
351 | #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN 0x0001 | 354 | #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN 0x0001 |
352 | 355 | ||
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 0d9045aa2c4b..e9875625dcf0 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
@@ -37,6 +37,7 @@ static const struct hid_blacklist { | |||
37 | { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, | 37 | { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, |
38 | { USB_VENDOR_ID_NATSU, USB_DEVICE_ID_NATSU_GAMEPAD, HID_QUIRK_BADPAD }, | 38 | { USB_VENDOR_ID_NATSU, USB_DEVICE_ID_NATSU_GAMEPAD, HID_QUIRK_BADPAD }, |
39 | { USB_VENDOR_ID_NEC, USB_DEVICE_ID_NEC_USB_GAME_PAD, HID_QUIRK_BADPAD }, | 39 | { USB_VENDOR_ID_NEC, USB_DEVICE_ID_NEC_USB_GAME_PAD, HID_QUIRK_BADPAD }, |
40 | { USB_VENDOR_ID_NEXTWINDOW, USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN, HID_QUIRK_MULTI_INPUT}, | ||
40 | { USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RUMBLEPAD, HID_QUIRK_BADPAD }, | 41 | { USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RUMBLEPAD, HID_QUIRK_BADPAD }, |
41 | { USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD, HID_QUIRK_BADPAD }, | 42 | { USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD, HID_QUIRK_BADPAD }, |
42 | 43 | ||