1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index d86398755b0d..6836a856c243 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -1657,16 +1657,16 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)
         }
 
         list_for_each_entry_safe(hidinput, next, &hid->inputs, list) {
-                if ((hid->quirks & HID_QUIRK_NO_EMPTY_INPUT) &&
-                    !hidinput_has_been_populated(hidinput)) {
+                if (drv->input_configured &&
+                    drv->input_configured(hid, hidinput))
+                        goto out_unwind;
+
+                if (!hidinput_has_been_populated(hidinput)) {
                         /* no need to register an input device not populated */
                         hidinput_cleanup_hidinput(hid, hidinput);
                         continue;
                 }
 
-                if (drv->input_configured &&
-                    drv->input_configured(hid, hidinput))
-                        goto out_unwind;
                 if (input_register_device(hidinput->input))
                         goto out_unwind;
                 hidinput->registered = true;