diff options
| author | Alexey Klimov <klimov.linux@gmail.com> | 2013-03-28 00:07:29 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-03-29 15:13:39 +0100 |
| commit | 5b4617d82020addf244c8c5206270e49ef9933d6 (patch) | |
| tree | 83b9f618c0c160dfd237daea4af0b71fe8e47bd8 /drivers/hid/hid-ids.h | |
| parent | 6aeedba20e82150757f2dd5b896f0e09491a987c (diff) | |
| download | op-kernel-dev-5b4617d82020addf244c8c5206270e49ef9933d6.zip op-kernel-dev-5b4617d82020addf244c8c5206270e49ef9933d6.tar.gz | |
HID: fix Masterkit MA901 hid quirks
This patch reverts commit 0322bd3980 ("usb hid quirks for Masterkit MA901 usb
radio") and adds checks in hid_ignore() for Masterkit MA901 usb radio device.
This usb radio device shares USB ID with many Atmel V-USB (and probably other)
devices so patch sorts things out by checking name, vendor, product of hid device.
Signed-off-by: Alexey Klimov <klimov.linux@gmail.com>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index c438877..5309fd5 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -158,6 +158,8 @@ #define USB_VENDOR_ID_ATMEL 0x03eb #define USB_DEVICE_ID_ATMEL_MULTITOUCH 0x211c #define USB_DEVICE_ID_ATMEL_MXT_DIGITIZER 0x2118 +#define USB_VENDOR_ID_ATMEL_V_USB 0x16c0 +#define USB_DEVICE_ID_ATMEL_V_USB 0x05df #define USB_VENDOR_ID_AUREAL 0x0755 #define USB_DEVICE_ID_AUREAL_W01RN 0x2626 @@ -557,9 +559,6 @@ #define USB_VENDOR_ID_MADCATZ 0x0738 #define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540 -#define USB_VENDOR_ID_MASTERKIT 0x16c0 -#define USB_DEVICE_ID_MASTERKIT_MA901RADIO 0x05df - #define USB_VENDOR_ID_MCC 0x09db #define USB_DEVICE_ID_MCC_PMD1024LS 0x0076 #define USB_DEVICE_ID_MCC_PMD1208LS 0x007a |
