diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2008-04-02 11:34:10 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-04-22 11:34:57 +0200 |
| commit | 671d994cfbe10a9b2a474d26db2cef3c878846dc (patch) | |
| tree | 87da7d5d59bc6ba4b7719ef65cdd57fc99e34ff3 /drivers | |
| parent | HID: force feedback driver for Logitech Rumblepad 2 (diff) | |
| download | linux-dev-671d994cfbe10a9b2a474d26db2cef3c878846dc.tar.xz linux-dev-671d994cfbe10a9b2a474d26db2cef3c878846dc.zip | |
HID: fix misplaced rdesc quirk
This moves the misplaced rdesc quirk to the place where it belongs.
Reported-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index e55b20b01993..6ad33fe2c165 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c @@ -1163,6 +1163,9 @@ static void __usbhid_fixup_report_descriptor(__u32 quirks, char *rdesc, unsigned if (quirks & HID_QUIRK_RDESC_MICROSOFT_RECV_1028) usbhid_fixup_microsoft_descriptor(rdesc, rsize); + + if (quirks & HID_QUIRK_RDESC_SUNPLUS_WDESKTOP) + usbhid_fixup_sunplus_wdesktop(rdesc, rsize); } /** @@ -1201,8 +1204,4 @@ void usbhid_fixup_report_descriptor(const u16 idVendor, const u16 idProduct, else if (paramVendor == idVendor && paramProduct == idProduct) __usbhid_fixup_report_descriptor(quirks, rdesc, rsize); } - - if (quirks & HID_QUIRK_RDESC_SUNPLUS_WDESKTOP) - usbhid_fixup_sunplus_wdesktop(rdesc, rsize); - } |