Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[firefly-linux-kernel-4.4.55.git] / drivers / hid / hid-core.c

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 70ca07f10d5c210fc3665a9da47b3014938a716a..4da66b4b977c334df920200d1ee08d5ec6a1b164 100644 (file)
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -2026,6 +2026,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 &&