summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-core.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-01-13 11:15:22 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-02-14 16:40:00 -0200
commit65dd3b699f38b9252e5e1aa2ad7fb37ef9c61f37 (patch)
tree846e63431d9d7e976987539c9f4a4cc3d1f2a9c7 /drivers/hid/hid-core.c
parent1bf20c3a0c616f44359c573b533d06bae960ee45 (diff)
downloadblackbird-obmc-linux-65dd3b699f38b9252e5e1aa2ad7fb37ef9c61f37.tar.gz
blackbird-obmc-linux-65dd3b699f38b9252e5e1aa2ad7fb37ef9c61f37.zip
[media] hid-core: ignore the Keene FM transmitter
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. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/hid/hid-core.c')
-rw-r--r--drivers/hid/hid-core.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index af08ce7207d9..dd1bab481175 100644
--- a/drivers/hid/hid-core.c
+++ b/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 &&
OpenPOWER on IntegriCloud