Commit f9482dab authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

Revert "HID: core: Call request_module before doing device_add" 

This reverts commit a025a18f.

This patch and 4ceabaf7 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: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
parent e0b7f9bc

drivers/hid/hid-core.c

+0 −8
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE