diff options
author | Kristian Evensen <kristian.evensen@gmail.com> | 2015-01-20 11:55:03 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2015-01-20 14:13:25 -0500 |
commit | a8c8316b11594e616df641b4b19ec9da732f93df (patch) | |
tree | 26967051df7b4e3e31230f772a593160cb52b695 /drivers | |
parent | 606185b20caf4c57d7e41e5a5ea4aff460aef2ab (diff) |
HID: do not bind to Microchip Pick16F1454
The Microchip Pick16F1454 is exported as a HID device and is used by for
example the Yepkit YKUSH three-port switchable USB hub. However, it is not an
actual HID-device. On the Yepkit, it is used to power up/down the ports on the
hub. The HID driver should ignore this device.
Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 8b638792cb43..77afffc6bab8 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -2328,6 +2328,7 @@ static const struct hid_device_id hid_ignore_list[] = { | |||
2328 | { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) }, | 2328 | { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) }, |
2329 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) }, | 2329 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) }, |
2330 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT2) }, | 2330 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT2) }, |
2331 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICK16F1454) }, | ||
2331 | { HID_USB_DEVICE(USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR, USB_DEVICE_ID_N_S_HARMONY) }, | 2332 | { HID_USB_DEVICE(USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR, USB_DEVICE_ID_N_S_HARMONY) }, |
2332 | { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100) }, | 2333 | { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100) }, |
2333 | { HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 20) }, | 2334 | { 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 9243359c1821..8df47449126c 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -638,6 +638,7 @@ | |||
638 | #define USB_DEVICE_ID_PICKIT2 0x0033 | 638 | #define USB_DEVICE_ID_PICKIT2 0x0033 |
639 | #define USB_DEVICE_ID_PICOLCD 0xc002 | 639 | #define USB_DEVICE_ID_PICOLCD 0xc002 |
640 | #define USB_DEVICE_ID_PICOLCD_BOOTLOADER 0xf002 | 640 | #define USB_DEVICE_ID_PICOLCD_BOOTLOADER 0xf002 |
641 | #define USB_DEVICE_ID_PICK16F1454 0x0042 | ||
641 | 642 | ||
642 | #define USB_VENDOR_ID_MICROSOFT 0x045e | 643 | #define USB_VENDOR_ID_MICROSOFT 0x045e |
643 | #define USB_DEVICE_ID_SIDEWINDER_GV 0x003b | 644 | #define USB_DEVICE_ID_SIDEWINDER_GV 0x003b |