mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 00:39:48 +00:00
Revert "HID: core: Do not call request_module() in async context"
This reverts commit4ceabaf790
. This patch anda025a18fe
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>
This commit is contained in:
parent
15fc1b5c86
commit
e0b7f9bc02
1 changed files with 2 additions and 4 deletions
|
@ -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)
|
||||||
* 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);
|
||||||
|
|
Loading…
Reference in a new issue