Merge branches 'upstream' and 'upstream-fixes' into for-linus

1 files changed, 0 insertions, 8 deletions

diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c
index 703e9d0e8714..35689ef172cc 100644
--- a/drivers/hid/usbhid/usbmouse.c
+++ b/drivers/hid/usbhid/usbmouse.c
@@ -129,14 +129,6 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i
         if (!usb_endpoint_is_int_in(endpoint))
                 return -ENODEV;
 
-#ifdef CONFIG_USB_HID
-        if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
-                                le16_to_cpu(dev->descriptor.idProduct))
-                        & (HID_QUIRK_IGNORE|HID_QUIRK_IGNORE_MOUSE)) {
-                return -ENODEV;
-        }
-#endif
-
         pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
         maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));