HID: move ignore quirks

[mirror_ubuntu-bionic-kernel.git] / drivers / hid / usbhid / hid-core.c

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index d2a3461909a3549c0983195a39636eb5f21754c6..9f5e100e95eca43ecde5a3db0d433d44b9cddaa1 100644 (file)
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -791,9 +791,6 @@ static int usbhid_parse(struct hid_device *hid)
                                quirks |= HID_QUIRK_NOGET;
        }
 
-       if (quirks & HID_QUIRK_IGNORE)
-               return -ENODEV;
-
        if ((quirks & HID_QUIRK_IGNORE_MOUSE) &&
                (interface->desc.bInterfaceProtocol == USB_INTERFACE_PROTOCOL_MOUSE))
                        return -ENODEV;
@@ -1082,7 +1079,8 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
        ret = hid_add_device(hid);
        if (ret) {
-               dev_err(&intf->dev, "can't add hid device: %d\n", ret);
+               if (ret != -ENODEV)
+                       dev_err(&intf->dev, "can't add hid device: %d\n", ret);
                goto err;
        }