diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2016-02-12 17:10:37 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-02-16 11:03:50 +0100 |
| commit | 4392bf333388cabdad5afe5b1500002d7b9c318e (patch) | |
| tree | 1a377fe5b8b970ec4bf5557052f4c2a8683899a4 /drivers/hid | |
| parent | 5d74325a2201376a95520a4a38a1ce2c65761c49 (diff) | |
| download | blackbird-op-linux-4392bf333388cabdad5afe5b1500002d7b9c318e.tar.gz blackbird-op-linux-4392bf333388cabdad5afe5b1500002d7b9c318e.zip | |
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>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index bf63ff89e2e6..729cc4903ec6 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -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); |
