From 1621a64e8571746fd4c9a1d406fe5f482a1c0116 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 14 Oct 2008 22:34:32 +0200 Subject: [PATCH] --- yaml --- r: 114471 b: refs/heads/master c: ffcf70fb0693f1ab0133f973b5b9c552be766b16 h: refs/heads/master i: 114469: bd1f10228e9e355e916da821ffbd450658e374b2 114467: 3a1c260030d2c5fc993e9e8d065a6f3915af6aca 114463: 99bfb639717bb89b5f36a346ea7fd421ceb7cb11 v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-core.c | 1 + trunk/drivers/hid/hid-ids.h | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 66289e28e09e..0d5da2e5eb56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0dc491682f6e673a14c643d9a3e7305ce4616b96 +refs/heads/master: ffcf70fb0693f1ab0133f973b5b9c552be766b16 diff --git a/trunk/drivers/hid/hid-core.c b/trunk/drivers/hid/hid-core.c index d749447a682d..599846052fe3 100644 --- a/trunk/drivers/hid/hid-core.c +++ b/trunk/drivers/hid/hid-core.c @@ -1251,6 +1251,7 @@ static const struct hid_device_id hid_blacklist[] = { { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, + { HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) }, { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) }, { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) }, diff --git a/trunk/drivers/hid/hid-ids.h b/trunk/drivers/hid/hid-ids.h index 89c5cc169439..11afd33cbd6d 100644 --- a/trunk/drivers/hid/hid-ids.h +++ b/trunk/drivers/hid/hid-ids.h @@ -97,6 +97,9 @@ #define USB_DEVICE_ID_ATEN_4PORTKVM 0x2205 #define USB_DEVICE_ID_ATEN_4PORTKVMC 0x2208 +#define USB_VENDOR_ID_AVERMEDIA 0x07ca +#define USB_DEVICE_ID_AVER_FM_MR800 0xb800 + #define USB_VENDOR_ID_BELKIN 0x050d #define USB_DEVICE_ID_FLIP_KVM 0x3201