2 files changed, 3 insertions, 2 deletions

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 3f56e9c02e65..0258289f3b3e 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -996,7 +996,8 @@ static int usbhid_start(struct hid_device *hid)
         usbhid->urbctrl->transfer_dma = usbhid->ctrlbuf_dma;
         usbhid->urbctrl->transfer_flags |= (URB_NO_TRANSFER_DMA_MAP | URB_NO_SETUP_DMA_MAP);
 
-        usbhid_init_reports(hid);
+        if (!(hid->quirks & HID_QUIRK_NO_INIT_REPORTS))
+                usbhid_init_reports(hid);
 
         set_bit(HID_STARTED, &usbhid->iofl);
 
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 2d445b270215..c3b02f59792b 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -281,7 +281,7 @@ u32 usbhid_lookup_quirk(const u16 idVendor, const u16 idProduct)
         if (idVendor == USB_VENDOR_ID_NCR &&
                         idProduct >= USB_DEVICE_ID_NCR_FIRST &&
                         idProduct <= USB_DEVICE_ID_NCR_LAST)
-                        return HID_QUIRK_NOGET;
+                        return HID_QUIRK_NO_INIT_REPORTS;
 
         down_read(&dquirks_rwsem);
         bl_entry = usbhid_exists_dquirk(idVendor, idProduct);