summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Vogel <vogelchr@vogel.cx>2014-02-12 20:56:00 +0100
committerJiri Slaby <jslaby@suse.cz>2015-07-30 13:21:18 +0200
commitacb700bcb59e17e377638addedb4cfec1b912e34 (patch)
tree1ac34708095692b43f5448e61b64b21cf640c817
parenta3b83ace8c93efb4b2e0cc345d7ec7f845af3cee (diff)
downloadlwn-acb700bcb59e17e377638addedb4cfec1b912e34.tar.gz
lwn-acb700bcb59e17e377638addedb4cfec1b912e34.zip
usbhid/quirks: Ignore Riso Kagaku Webmail Notifier
commit 759db9ead2c064203e9cb46bfff7c8ef25417b65 upstream. The "Webmail Notifier" is a USB controlled LED that appears as a HID device. When trying to change the LED via hidraw it returns malformed reports. As "usbled" supports it, we blacklist it in usbhid. Signed-off-by: Christian Vogel <vogelchr@vogel.cx> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-rw-r--r--drivers/hid/hid-core.c1
-rw-r--r--drivers/hid/hid-ids.h3
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index a35bb34e0b08..eb23021390cb 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -2307,6 +2307,7 @@ static const struct hid_device_id hid_ignore_list[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20) },
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_8_8_4_IF_KIT) },
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_RISO_KAGAKU, USB_DEVICE_ID_RI_KA_WEBMAIL) },
{ }
};
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 9888f669d58e..7d036aadb567 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -978,4 +978,7 @@
#define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05
+#define USB_VENDOR_ID_RISO_KAGAKU 0x1294 /* Riso Kagaku Corp. */
+#define USB_DEVICE_ID_RI_KA_WEBMAIL 0x1320 /* Webmail Notifier */
+
#endif