Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
HID blacklisting of all Code Mercenaries IOWarrior devices
+10
-11
+10
-11
drivers/usb/input/hid-core.c
+10
-11
drivers/usb/input/hid-core.c
···
686
686
#define USB_DEVICE_ID_SMARTJOY_DUAL_PLUS 0x8802
687
687
688
688
#define USB_VENDOR_ID_CODEMERCS 0x07c0
689
-
#define USB_DEVICE_ID_CODEMERCS_IOW40 0x1500
690
-
#define USB_DEVICE_ID_CODEMERCS_IOW24 0x1501
691
-
#define USB_DEVICE_ID_CODEMERCS_IOW48 0x1502
692
-
#define USB_DEVICE_ID_CODEMERCS_IOW28 0x1503
689
+
#define USB_DEVICE_ID_CODEMERCS_IOW_FIRST 0x1500
690
+
#define USB_DEVICE_ID_CODEMERCS_IOW_LAST 0x15ff
693
691
694
692
#define USB_VENDOR_ID_DELORME 0x1163
695
693
#define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100
···
787
789
{ USB_VENDOR_ID_AIRCABLE, USB_DEVICE_ID_AIRCABLE1, HID_QUIRK_IGNORE },
788
790
{ USB_VENDOR_ID_ALCOR, USB_DEVICE_ID_ALCOR_USBRS232, HID_QUIRK_IGNORE },
789
791
{ USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD, HID_QUIRK_IGNORE },
790
-
{ USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW40, HID_QUIRK_IGNORE },
791
-
{ USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW24, HID_QUIRK_IGNORE },
792
-
{ USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW48, HID_QUIRK_IGNORE },
793
-
{ USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW28, HID_QUIRK_IGNORE },
794
792
{ USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_HIDCOM, HID_QUIRK_IGNORE },
795
793
{ USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_ULTRAMOUSE, HID_QUIRK_IGNORE },
796
794
{ USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE, HID_QUIRK_IGNORE },
···
1064
1070
int n, len, insize = 0;
1065
1071
struct usbhid_device *usbhid;
1066
1072
1067
-
/* Ignore all Wacom devices */
1068
-
if (le16_to_cpu(dev->descriptor.idVendor) == USB_VENDOR_ID_WACOM)
1069
-
return NULL;
1073
+
/* Ignore all Wacom devices */
1074
+
if (le16_to_cpu(dev->descriptor.idVendor) == USB_VENDOR_ID_WACOM)
1075
+
return NULL;
1076
+
/* ignore all Code Mercenaries IOWarrior devices */
1077
+
if (le16_to_cpu(dev->descriptor.idVendor) == USB_VENDOR_ID_CODEMERCS)
1078
+
if (le16_to_cpu(dev->descriptor.idProduct) >= USB_DEVICE_ID_CODEMERCS_IOW_FIRST &&
1079
+
le16_to_cpu(dev->descriptor.idProduct) <= USB_DEVICE_ID_CODEMERCS_IOW_LAST)
1080
+
return NULL;
1070
1081
1071
1082
for (n = 0; hid_blacklist[n].idVendor; n++)
1072
1083
if ((hid_blacklist[n].idVendor == le16_to_cpu(dev->descriptor.idVendor)) &&