diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2014-09-30 13:18:24 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-05-01 00:05:48 +0200 |
| commit | 1d0c5109f227c3387a12a218ee1155e20fdafc03 (patch) | |
| tree | 3ebfefc1b2e899af95e9ec7608c45063b826a079 /drivers/hid | |
| parent | c6eb01fbb9dd914516b0cd4738bf3d2ae0f6bf93 (diff) | |
| download | linux-stable-1d0c5109f227c3387a12a218ee1155e20fdafc03.tar.gz linux-stable-1d0c5109f227c3387a12a218ee1155e20fdafc03.tar.bz2 linux-stable-1d0c5109f227c3387a12a218ee1155e20fdafc03.zip | |
HID: core: do not scan reports if the group is already set
commit 9578f41aeaee5010384f4f8484da1566e2ce4901 upstream.
This allows the transport layer (I have in mind hid-logitech-dj and uhid)
to set the group before it is added to the hid bus. This way, it can
bypass the hid_scan_report() call, and choose in advance which driver
will handle the newly created hid device.
Signed-off-by: Benjamin Tisssoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 8e3c270dd0c2..d47fbc7774cf 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -2532,7 +2532,8 @@ int hid_add_device(struct hid_device *hdev) * Scan generic devices for group information */ if (hid_ignore_special_drivers || - !hid_match_id(hdev, hid_have_special_driver)) { + (!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); |