Commit e0b7f9bc authored by Benjamin Tissoires's avatar Benjamin Tissoires

Revert "HID: core: Do not call request_module() in async context"

This reverts commit 4ceabaf7.

This patch and a025a18f are giving extended timeouts
on boot for at least Ubuntu and openSUSE.

Revert them until we get a better fix.
Acked-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
parent 15fc1b5c
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/semaphore.h> #include <linux/semaphore.h>
#include <linux/async.h>
#include <linux/hid.h> #include <linux/hid.h>
#include <linux/hiddev.h> #include <linux/hiddev.h>
...@@ -2370,9 +2369,8 @@ int hid_add_device(struct hid_device *hdev) ...@@ -2370,9 +2369,8 @@ int hid_add_device(struct hid_device *hdev)
* not first have hid-generic binding only to have it replaced * not first have hid-generic binding only to have it replaced
* immediately afterwards with a specialized driver. * immediately afterwards with a specialized driver.
*/ */
if (!current_is_async()) request_module("hid:b%04Xg%04Xv%08Xp%08X",
request_module("hid:b%04Xg%04Xv%08Xp%08X", hdev->bus, hdev->bus, hdev->group, hdev->vendor, hdev->product);
hdev->group, hdev->vendor, hdev->product);
hid_debug_register(hdev, dev_name(&hdev->dev)); hid_debug_register(hdev, dev_name(&hdev->dev));
ret = device_add(&hdev->dev); ret = device_add(&hdev->dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment