aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/usbhid
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hid/usbhid')
-rw-r--r--drivers/hid/usbhid/hid-quirks.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 3f977abb62b1..cc1927b1b88a 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -75,8 +75,6 @@ static const struct hid_rdesc_blacklist {
75 __u16 idProduct; 75 __u16 idProduct;
76 __u32 quirks; 76 __u32 quirks;
77} hid_rdesc_blacklist[] = { 77} hid_rdesc_blacklist[] = {
78 { USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E, HID_QUIRK_RDESC_BUTTON_CONSUMER },
79
80 { USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_RDESC_SAMSUNG_REMOTE }, 78 { USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_RDESC_SAMSUNG_REMOTE },
81 79
82 { 0, 0 } 80 { 0, 0 }
@@ -337,20 +335,8 @@ static void usbhid_fixup_samsung_irda_descriptor(unsigned char *rdesc,
337 } 335 }
338} 336}
339 337
340static void usbhid_fixup_button_consumer_descriptor(unsigned char *rdesc, int rsize)
341{
342 if (rsize >= 30 && rdesc[29] == 0x05
343 && rdesc[30] == 0x09) {
344 printk(KERN_INFO "Fixing up button/consumer in HID report descriptor\n");
345 rdesc[30] = 0x0c;
346 }
347}
348
349static void __usbhid_fixup_report_descriptor(__u32 quirks, char *rdesc, unsigned rsize) 338static void __usbhid_fixup_report_descriptor(__u32 quirks, char *rdesc, unsigned rsize)
350{ 339{
351 if (quirks & HID_QUIRK_RDESC_BUTTON_CONSUMER)
352 usbhid_fixup_button_consumer_descriptor(rdesc, rsize);
353
354 if (quirks & HID_QUIRK_RDESC_SAMSUNG_REMOTE) 340 if (quirks & HID_QUIRK_RDESC_SAMSUNG_REMOTE)
355 usbhid_fixup_samsung_irda_descriptor(rdesc, rsize); 341 usbhid_fixup_samsung_irda_descriptor(rdesc, rsize);
356} 342}