From: Jiri Kosina Date: Wed, 2 Apr 2008 09:34:10 +0000 (+0200) Subject: HID: fix misplaced rdesc quirk X-Git-Tag: v2.6.26-rc1~1107^2~9 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=671d994cfbe10a9b2a474d26db2cef3c878846dc;p=linux-2.6 HID: fix misplaced rdesc quirk This moves the misplaced rdesc quirk to the place where it belongs. Reported-by: Jiri Slaby Signed-off-by: Jiri Kosina --- diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index e55b20b019..6ad33fe2c1 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); - }