Commit 4392bf33 authored Feb 12, 2016 by Benjamin Tissoires Committed by Jiri Kosina Feb 16, 2016

HID: fix hid_ignore_special_drivers module parameter



hid_ignore_special_drivers works fine until hid_scan_report autodetects and
reassign devices (for hid-multitouch, hid-microsoft and hid-rmi).

Simplify the handling of the parameter: if it is there, use hid-generic, no
matter what, and if not, scan the device or rely on the hid_have_special_driver
table.

This was detected while trying to disable hid-multitouch on a Surface Pro cover
which prevented to use the keyboard.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
CC: stable@vger.kernel.org
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

parent 5d74325a

drivers/hid/hid-core.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -2661,9 +2661,10 @@ int hid_add_device(struct hid_device *hdev)
		/*
		* Scan generic devices for group information
		*/
		if (hid_ignore_special_drivers \|\|
		(!hdev->group &&
		!hid_match_id(hdev, hid_have_special_driver))) {
		if (hid_ignore_special_drivers) {
		hdev->group = HID_GROUP_GENERIC;
		} else if (!hdev->group &&
		!hid_match_id(hdev, hid_have_special_driver)) {
		ret = hid_scan_report(hdev);
		if (ret)
		hid_warn(hdev, "bad device descriptor (%d)\n", ret);