aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorAlexey Klimov <klimov.linux@gmail.com>2012-11-12 00:57:03 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-12-28 09:21:58 -0500
commit0322bd3980b3ebf7dde8474e22614cb443d6479a (patch)
tree0707489b5c7cae7f8488aa8b3bb42153a65d612b /drivers/hid
parent4834f4d1ff1dc574024e1a6de920ea99571090ff (diff)
[hid] usb hid quirks for Masterkit MA901 usb radio
Don't let Masterkit MA901 USB radio be handled by usb hid drivers. This device will be handled by radio-ma901.c driver. Signed-off-by: Alexey Klimov <klimov.linux@gmail.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-core.c1
-rw-r--r--drivers/hid/hid-ids.h3
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index eb2ee11b6412..ccca9ac34dca 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -2070,6 +2070,7 @@ static const struct hid_device_id hid_ignore_list[] = {
2070 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) }, 2070 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) },
2071 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) }, 2071 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) },
2072 { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD) }, 2072 { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD) },
2073 { HID_USB_DEVICE(USB_VENDOR_ID_MASTERKIT, USB_DEVICE_ID_MASTERKIT_MA901RADIO) },
2073 { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) }, 2074 { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) },
2074 { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) }, 2075 { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) },
2075 { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) }, 2076 { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 4dfa605e2d14..f39be08c1358 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -551,6 +551,9 @@
551#define USB_VENDOR_ID_MADCATZ 0x0738 551#define USB_VENDOR_ID_MADCATZ 0x0738
552#define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540 552#define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540
553 553
554#define USB_VENDOR_ID_MASTERKIT 0x16c0
555#define USB_DEVICE_ID_MASTERKIT_MA901RADIO 0x05df
556
554#define USB_VENDOR_ID_MCC 0x09db 557#define USB_VENDOR_ID_MCC 0x09db
555#define USB_DEVICE_ID_MCC_PMD1024LS 0x0076 558#define USB_DEVICE_ID_MCC_PMD1024LS 0x0076
556#define USB_DEVICE_ID_MCC_PMD1208LS 0x007a 559#define USB_DEVICE_ID_MCC_PMD1208LS 0x007a