aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/usbhid
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2008-04-02 05:34:10 -0400
committerJiri Kosina <jkosina@suse.cz>2008-04-22 05:34:57 -0400
commit671d994cfbe10a9b2a474d26db2cef3c878846dc (patch)
tree87da7d5d59bc6ba4b7719ef65cdd57fc99e34ff3 /drivers/hid/usbhid
parentc17f9c901c4e62cbf857b831bcc3070380449b88 (diff)
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/hid/usbhid')
-rw-r--r--drivers/hid/usbhid/hid-quirks.c7
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
1163 1163
1164 if (quirks & HID_QUIRK_RDESC_MICROSOFT_RECV_1028) 1164 if (quirks & HID_QUIRK_RDESC_MICROSOFT_RECV_1028)
1165 usbhid_fixup_microsoft_descriptor(rdesc, rsize); 1165 usbhid_fixup_microsoft_descriptor(rdesc, rsize);
1166
1167 if (quirks & HID_QUIRK_RDESC_SUNPLUS_WDESKTOP)
1168 usbhid_fixup_sunplus_wdesktop(rdesc, rsize);
1166} 1169}
1167 1170
1168/** 1171/**
@@ -1201,8 +1204,4 @@ void usbhid_fixup_report_descriptor(const u16 idVendor, const u16 idProduct,
1201 else if (paramVendor == idVendor && paramProduct == idProduct) 1204 else if (paramVendor == idVendor && paramProduct == idProduct)
1202 __usbhid_fixup_report_descriptor(quirks, rdesc, rsize); 1205 __usbhid_fixup_report_descriptor(quirks, rdesc, rsize);
1203 } 1206 }
1204
1205 if (quirks & HID_QUIRK_RDESC_SUNPLUS_WDESKTOP)
1206 usbhid_fixup_sunplus_wdesktop(rdesc, rsize);
1207
1208} 1207}