From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Date: Wed, 5 Jun 2019 12:44:06 +0000 (+0200)
Subject: Revert "HID: core: Do not call request_module() in async context"
X-Git-Tag: v5.2-rc5~20^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e0b7f9bc0246bc642d1de2ff3ff133730584c956;p=linux.git

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>
---

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);