From 89773ef96ac9eee035f1ab9a87cfb3295702df94 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 13 Jan 2012 11:15:22 -0300 Subject: [PATCH] --- yaml --- r: 294913 b: refs/heads/master c: 65dd3b699f38b9252e5e1aa2ad7fb37ef9c61f37 h: refs/heads/master i: 294911: 35f6dac3f64b3fad7bff5dbe7847545534ed4009 v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-core.c | 10 ++++++++++ trunk/drivers/hid/hid-ids.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9c3d81132d88..554bf51dd6ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1bf20c3a0c616f44359c573b533d06bae960ee45 +refs/heads/master: 65dd3b699f38b9252e5e1aa2ad7fb37ef9c61f37 diff --git a/trunk/drivers/hid/hid-core.c b/trunk/drivers/hid/hid-core.c index af08ce7207d9..dd1bab481175 100644 --- a/trunk/drivers/hid/hid-core.c +++ b/trunk/drivers/hid/hid-core.c @@ -1993,6 +1993,16 @@ static bool hid_ignore(struct hid_device *hdev) if (hdev->product >= USB_DEVICE_ID_LOGITECH_HARMONY_FIRST && hdev->product <= USB_DEVICE_ID_LOGITECH_HARMONY_LAST) return true; + /* + * The Keene FM transmitter USB device has the same USB ID as + * the Logitech AudioHub Speaker, but it should ignore the hid. + * Check if the name is that of the Keene device. + * For reference: the name of the AudioHub is + * "HOLTEK AudioHub Speaker". + */ + if (hdev->product == USB_DEVICE_ID_LOGITECH_AUDIOHUB && + !strcmp(hdev->name, "HOLTEK B-LINK USB Audio ")) + return true; break; case USB_VENDOR_ID_SOUNDGRAPH: if (hdev->product >= USB_DEVICE_ID_SOUNDGRAPH_IMON_FIRST && diff --git a/trunk/drivers/hid/hid-ids.h b/trunk/drivers/hid/hid-ids.h index b8574cddd953..e1c4535c7c01 100644 --- a/trunk/drivers/hid/hid-ids.h +++ b/trunk/drivers/hid/hid-ids.h @@ -451,6 +451,7 @@ #define USB_DEVICE_ID_LG_MULTITOUCH 0x0064 #define USB_VENDOR_ID_LOGITECH 0x046d +#define USB_DEVICE_ID_LOGITECH_AUDIOHUB 0x0a0e #define USB_DEVICE_ID_LOGITECH_RECEIVER 0xc101 #define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST 0xc110 #define USB_DEVICE_ID_LOGITECH_HARMONY_LAST 0xc14f