diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-04-05 13:19:57 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-04-05 13:27:22 +0200 |
| commit | af73686e7bfe49fbbccc099995be8c78ce5bfe9a (patch) | |
| tree | b5dd616fc6894b433e06b1f16aec0b5443deee17 /drivers/hid/hid-input.c | |
| parent | Merge branch 'for-4.17/hid-i2c' into for-linus (diff) | |
| parent | HID: core: reset the quirks before calling probe again (diff) | |
| download | linux-af73686e7bfe49fbbccc099995be8c78ce5bfe9a.tar.xz linux-af73686e7bfe49fbbccc099995be8c78ce5bfe9a.zip | |
Merge branch 'for-4.17/multitouch' into for-linus
Pull Razer Blade Stealth support improvement and a few generic cleanups
Diffstat (limited to 'drivers/hid/hid-input.c')
| -rw-r--r-- | drivers/hid/hid-input.c | 10 |
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; |