diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2019-06-05 14:44:07 +0200 |
|---|---|---|
| committer | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2019-06-05 15:16:26 +0200 |
| commit | f9482dabfd1686987cc6044e06ae0e4c05915518 (patch) | |
| tree | 5a1dac26e6d4e0bc34c16d3ea3d0d1e051f4e396 /drivers/hid/hid-core.c | |
| parent | Revert "HID: core: Do not call request_module() in async context" (diff) | |
| download | linux-f9482dabfd1686987cc6044e06ae0e4c05915518.tar.xz linux-f9482dabfd1686987cc6044e06ae0e4c05915518.zip | |
Revert "HID: core: Call request_module before doing device_add"
This reverts commit a025a18fecd4429f4ca66b1746001263c052ecbb.
This patch and 4ceabaf79 are giving extended timeouts
on boot for at least Ubuntu and openSUSE.
Revert them until we get a better fix.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=203741
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Diffstat (limited to 'drivers/hid/hid-core.c')
| -rw-r--r-- | drivers/hid/hid-core.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index aeae545859d4..39eba8106d40 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -2364,14 +2364,6 @@ int hid_add_device(struct hid_device *hdev) dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus, hdev->vendor, hdev->product, atomic_inc_return(&id)); - /* - * Try loading the module for the device before the add, so that we do - * not first have hid-generic binding only to have it replaced - * immediately afterwards with a specialized driver. - */ - 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); if (!ret) |