aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Evensen <kristian.evensen@gmail.com>2016-01-06 09:08:53 -0500
committerJiri Kosina <jkosina@suse.cz>2016-01-08 04:34:52 -0500
commit84f6ea1d86bfe578d2690db1631b9863a904a0df (patch)
treee27272e577c1b07fa72fedfc639f8abc9f493b2b
parent9a327405014f4ef4cdad67a0686db82b9f23c62c (diff)
HID: Add new PID for Microchip Pick16F1454
There seems to be a new version of the Microchip Pick16F1454 with a different PID (0xf2f7). This device should also be ignored by the HID driver. The PID was observed with the second version of the Yepkit Ykush USB hub. Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-core.c1
-rw-r--r--drivers/hid/hid-ids.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index c6f7a694f67a..ab3b86c327a3 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -2408,6 +2408,7 @@ static const struct hid_device_id hid_ignore_list[] = {
2408 { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) }, 2408 { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) },
2409 { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT2) }, 2409 { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT2) },
2410 { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICK16F1454) }, 2410 { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICK16F1454) },
2411 { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICK16F1454_V2) },
2411 { HID_USB_DEVICE(USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR, USB_DEVICE_ID_N_S_HARMONY) }, 2412 { HID_USB_DEVICE(USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR, USB_DEVICE_ID_N_S_HARMONY) },
2412 { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100) }, 2413 { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100) },
2413 { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 20) }, 2414 { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 20) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 9024a3de4032..c39fbc414889 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -669,6 +669,7 @@
669#define USB_DEVICE_ID_PICOLCD 0xc002 669#define USB_DEVICE_ID_PICOLCD 0xc002
670#define USB_DEVICE_ID_PICOLCD_BOOTLOADER 0xf002 670#define USB_DEVICE_ID_PICOLCD_BOOTLOADER 0xf002
671#define USB_DEVICE_ID_PICK16F1454 0x0042 671#define USB_DEVICE_ID_PICK16F1454 0x0042
672#define USB_DEVICE_ID_PICK16F1454_V2 0xf2f7
672 673
673#define USB_VENDOR_ID_MICROSOFT 0x045e 674#define USB_VENDOR_ID_MICROSOFT 0x045e
674#define USB_DEVICE_ID_SIDEWINDER_GV 0x003b 675#define USB_DEVICE_ID_SIDEWINDER_GV 0x003b