diff options
Diffstat (limited to 'drivers/hid/usbhid')
-rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 1614ed2efc15..7f38c21e146b 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
@@ -93,8 +93,6 @@ static const struct hid_rdesc_blacklist { | |||
93 | 93 | ||
94 | { USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_RDESC_SAMSUNG_REMOTE }, | 94 | { USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_RDESC_SAMSUNG_REMOTE }, |
95 | 95 | ||
96 | { USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP, HID_QUIRK_RDESC_SUNPLUS_WDESKTOP }, | ||
97 | |||
98 | { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1, HID_QUIRK_RDESC_SWAPPED_MIN_MAX }, | 96 | { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1, HID_QUIRK_RDESC_SWAPPED_MIN_MAX }, |
99 | { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2, HID_QUIRK_RDESC_SWAPPED_MIN_MAX }, | 97 | { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2, HID_QUIRK_RDESC_SWAPPED_MIN_MAX }, |
100 | 98 | ||
@@ -342,17 +340,6 @@ static void usbhid_fixup_cymotion_descriptor(char *rdesc, int rsize) | |||
342 | } | 340 | } |
343 | } | 341 | } |
344 | 342 | ||
345 | static void usbhid_fixup_sunplus_wdesktop(unsigned char *rdesc, int rsize) | ||
346 | { | ||
347 | if (rsize >= 107 && rdesc[104] == 0x26 | ||
348 | && rdesc[105] == 0x80 | ||
349 | && rdesc[106] == 0x03) { | ||
350 | printk(KERN_INFO "Fixing up Sunplus Wireless Desktop report descriptor\n"); | ||
351 | rdesc[105] = rdesc[110] = 0x03; | ||
352 | rdesc[106] = rdesc[111] = 0x21; | ||
353 | } | ||
354 | } | ||
355 | |||
356 | /* | 343 | /* |
357 | * Samsung IrDA remote controller (reports as Cypress USB Mouse). | 344 | * Samsung IrDA remote controller (reports as Cypress USB Mouse). |
358 | * | 345 | * |
@@ -444,9 +431,6 @@ static void __usbhid_fixup_report_descriptor(__u32 quirks, char *rdesc, unsigned | |||
444 | 431 | ||
445 | if (quirks & HID_QUIRK_RDESC_SAMSUNG_REMOTE) | 432 | if (quirks & HID_QUIRK_RDESC_SAMSUNG_REMOTE) |
446 | usbhid_fixup_samsung_irda_descriptor(rdesc, rsize); | 433 | usbhid_fixup_samsung_irda_descriptor(rdesc, rsize); |
447 | |||
448 | if (quirks & HID_QUIRK_RDESC_SUNPLUS_WDESKTOP) | ||
449 | usbhid_fixup_sunplus_wdesktop(rdesc, rsize); | ||
450 | } | 434 | } |
451 | 435 | ||
452 | /** | 436 | /** |