diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2019-06-05 14:44:06 +0200 |
|---|---|---|
| committer | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2019-06-05 15:16:19 +0200 |
| commit | e0b7f9bc0246bc642d1de2ff3ff133730584c956 (patch) | |
| tree | daa40de6d7993196450dc06b16e5c477517a3dc4 /drivers/hid | |
| parent | 15fc1b5c86128f91c8c6699c3b0d9615740b13f1 (diff) | |
| download | linux-e0b7f9bc0246bc642d1de2ff3ff133730584c956.tar.bz2 | |
Revert "HID: core: Do not call request_module() in async context"
This reverts commit 4ceabaf7909d109db6afbffc4ed182741fc32043.
This patch and a025a18fe are giving extended timeouts
on boot for at least Ubuntu and openSUSE.
Revert them until we get a better fix.
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 4407cf549908..aeae545859d4 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -30,7 +30,6 @@ #include <linux/vmalloc.h> #include <linux/sched.h> #include <linux/semaphore.h> -#include <linux/async.h> #include <linux/hid.h> #include <linux/hiddev.h> @@ -2370,9 +2369,8 @@ int hid_add_device(struct hid_device *hdev) * not first have hid-generic binding only to have it replaced * immediately afterwards with a specialized driver. */ - if (!current_is_async()) - request_module("hid:b%04Xg%04Xv%08Xp%08X", hdev->bus, - hdev->group, hdev->vendor, hdev->product); + request_module("hid:b%04Xg%04Xv%08Xp%08X", + hdev->bus, hdev->group, hdev->vendor, hdev->product); hid_debug_register(hdev, dev_name(&hdev->dev)); ret = device_add(&hdev->dev); |