diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-14 16:34:32 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2008-10-14 17:51:04 -0400 |
commit | ffcf70fb0693f1ab0133f973b5b9c552be766b16 (patch) | |
tree | 6e03daed3b0fa0afa11f67a5abd38786aad7a0ed /drivers/hid | |
parent | 0dc491682f6e673a14c643d9a3e7305ce4616b96 (diff) |
HID: Don't let Avermedia Radio FM800 be handled by usb hid drivers
Based on an original patch from Alexey Klimov <klimov.linux@gmail.com>,
against kernel version 2.6.27.
This device is already handled by radio-mr800 driver, and we therefore
want usbhid not to touch it.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index d749447a682d..599846052fe3 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1251,6 +1251,7 @@ static const struct hid_device_id hid_blacklist[] = { | |||
1251 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) }, | 1251 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) }, |
1252 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, | 1252 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, |
1253 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, | 1253 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, |
1254 | { HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) }, | ||
1254 | { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) }, | 1255 | { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) }, |
1255 | { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) }, | 1256 | { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) }, |
1256 | { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) }, | 1257 | { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 89c5cc169439..11afd33cbd6d 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -97,6 +97,9 @@ | |||
97 | #define USB_DEVICE_ID_ATEN_4PORTKVM 0x2205 | 97 | #define USB_DEVICE_ID_ATEN_4PORTKVM 0x2205 |
98 | #define USB_DEVICE_ID_ATEN_4PORTKVMC 0x2208 | 98 | #define USB_DEVICE_ID_ATEN_4PORTKVMC 0x2208 |
99 | 99 | ||
100 | #define USB_VENDOR_ID_AVERMEDIA 0x07ca | ||
101 | #define USB_DEVICE_ID_AVER_FM_MR800 0xb800 | ||
102 | |||
100 | #define USB_VENDOR_ID_BELKIN 0x050d | 103 | #define USB_VENDOR_ID_BELKIN 0x050d |
101 | #define USB_DEVICE_ID_FLIP_KVM 0x3201 | 104 | #define USB_DEVICE_ID_FLIP_KVM 0x3201 |
102 | 105 | ||