summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-ids.h
diff options
context:
space:
mode:
authorJD Cole2014-11-01 01:34:42 +0100
committerJiri Kosina2014-11-03 14:18:49 +0100
commit1a3f83f6493f9d78aa0fe31401fd530b0fe296da (patch)
treeaa225e5c3a11750eb702ee85f261000a387c44bd /drivers/hid/hid-ids.h
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff)
downloadkernel-qcow2-linux-1a3f83f6493f9d78aa0fe31401fd530b0fe296da.tar.gz
kernel-qcow2-linux-1a3f83f6493f9d78aa0fe31401fd530b0fe296da.tar.xz
kernel-qcow2-linux-1a3f83f6493f9d78aa0fe31401fd530b0fe296da.zip
HID: plantronics: fix errant mouse events
This version of the driver prevents Telephony pages which are not mapped as Consumer Control applications AND are not on the Consumer Page from being registered by the hid-input driver. Signed-off-by: JD Cole <jd.cole@plantronics.com> Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-ids.h')
-rw-r--r--drivers/hid/hid-ids.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index e23ab8b30626..f9f476db671c 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -715,6 +715,8 @@
#define USB_DEVICE_ID_ORTEK_PKB1700 0x1700
#define USB_DEVICE_ID_ORTEK_WKB2000 0x2000
+#define USB_VENDOR_ID_PLANTRONICS 0x047f
+
#define USB_VENDOR_ID_PANASONIC 0x04da
#define USB_DEVICE_ID_PANABOARD_UBT780 0x1044
#define USB_DEVICE_ID_PANABOARD_UBT880 0x104d