Skip to content

Commit e0b7f9b

Browse files
committed
Revert "HID: core: Do not call request_module() in async context"
This reverts commit 4ceabaf. This patch and a025a18 are giving extended timeouts on boot for at least Ubuntu and openSUSE. Revert them until we get a better fix. Acked-by: Jiri Kosina <[email protected]> Signed-off-by: Benjamin Tissoires <[email protected]>
1 parent 15fc1b5 commit e0b7f9b

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/hid/hid-core.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include <linux/vmalloc.h>
3131
#include <linux/sched.h>
3232
#include <linux/semaphore.h>
33-
#include <linux/async.h>
3433

3534
#include <linux/hid.h>
3635
#include <linux/hiddev.h>
@@ -2370,9 +2369,8 @@ int hid_add_device(struct hid_device *hdev)
23702369
* not first have hid-generic binding only to have it replaced
23712370
* immediately afterwards with a specialized driver.
23722371
*/
2373-
if (!current_is_async())
2374-
request_module("hid:b%04Xg%04Xv%08Xp%08X", hdev->bus,
2375-
hdev->group, hdev->vendor, hdev->product);
2372+
request_module("hid:b%04Xg%04Xv%08Xp%08X",
2373+
hdev->bus, hdev->group, hdev->vendor, hdev->product);
23762374

23772375
hid_debug_register(hdev, dev_name(&hdev->dev));
23782376
ret = device_add(&hdev->dev);

0 commit comments

Comments
 (0)