diff options
| -rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index ad8a4ac8e43c..a78f5187b6ef 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
| @@ -215,6 +215,10 @@ | |||
| 215 | #define USB_VENDOR_ID_MICROSOFT 0x045e | 215 | #define USB_VENDOR_ID_MICROSOFT 0x045e |
| 216 | #define USB_DEVICE_ID_SIDEWINDER_GV 0x003b | 216 | #define USB_DEVICE_ID_SIDEWINDER_GV 0x003b |
| 217 | 217 | ||
| 218 | #define USB_VENDOR_ID_NCR 0x0404 | ||
| 219 | #define USB_DEVICE_ID_NCR_FIRST 0x0300 | ||
| 220 | #define USB_DEVICE_ID_NCR_LAST 0x03ff | ||
| 221 | |||
| 218 | #define USB_VENDOR_ID_NEC 0x073e | 222 | #define USB_VENDOR_ID_NEC 0x073e |
| 219 | #define USB_DEVICE_ID_NEC_USB_GAME_PAD 0x0301 | 223 | #define USB_DEVICE_ID_NEC_USB_GAME_PAD 0x0301 |
| 220 | 224 | ||
| @@ -688,6 +692,12 @@ u32 usbhid_lookup_quirk(const u16 idVendor, const u16 idProduct) | |||
| 688 | idProduct <= USB_DEVICE_ID_CODEMERCS_IOW_LAST) | 692 | idProduct <= USB_DEVICE_ID_CODEMERCS_IOW_LAST) |
| 689 | return HID_QUIRK_IGNORE; | 693 | return HID_QUIRK_IGNORE; |
| 690 | 694 | ||
| 695 | /* NCR devices must not be queried for reports */ | ||
| 696 | if (idVendor == USB_VENDOR_ID_NCR && | ||
| 697 | idProduct >= USB_DEVICE_ID_NCR_FIRST && | ||
| 698 | idProduct <= USB_DEVICE_ID_NCR_LAST) | ||
| 699 | return HID_QUIRK_NOGET; | ||
| 700 | |||
| 691 | down_read(&dquirks_rwsem); | 701 | down_read(&dquirks_rwsem); |
| 692 | bl_entry = usbhid_exists_dquirk(idVendor, idProduct); | 702 | bl_entry = usbhid_exists_dquirk(idVendor, idProduct); |
| 693 | if (!bl_entry) | 703 | if (!bl_entry) |
