From 121289d81135755e1ad25b54edbb0e0a4e500284 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Wed, 2 Apr 2008 11:34:10 +0200 Subject: [PATCH] --- yaml --- r: 91857 b: refs/heads/master c: 671d994cfbe10a9b2a474d26db2cef3c878846dc h: refs/heads/master i: 91855: 75f673fe46c1e3789e4f02f9b26af7650f2c5b04 v: v3 --- [refs] | 2 +- trunk/drivers/hid/usbhid/hid-quirks.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4f4fdc0edf2a..be3ff726a7ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c17f9c901c4e62cbf857b831bcc3070380449b88 +refs/heads/master: 671d994cfbe10a9b2a474d26db2cef3c878846dc diff --git a/trunk/drivers/hid/usbhid/hid-quirks.c b/trunk/drivers/hid/usbhid/hid-quirks.c index e55b20b01993..6ad33fe2c165 100644 --- a/trunk/drivers/hid/usbhid/hid-quirks.c +++ b/trunk/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); - }