summaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen
diff options
context:
space:
mode:
authorForest Bond <forest.bond@rapidrollout.com>2013-10-21 12:38:18 -0400
committerJiri Kosina <jkosina@suse.cz>2013-11-11 11:19:26 +0100
commitae2aa3a512fa5f50f67feba9e66bc2efb394bd63 (patch)
treed9763aaea3a7f234588254203f28abc36ca0ac4f /drivers/input/touchscreen
parent95d50b6c5e18ff7351c5f2a6ff53afaed5f7e664 (diff)
downloadop-kernel-dev-ae2aa3a512fa5f50f67feba9e66bc2efb394bd63.zip
op-kernel-dev-ae2aa3a512fa5f50f67feba9e66bc2efb394bd63.tar.gz
Input: usbtouchscreen: ignore eGalax/D-Wav/EETI HIDs
The HID driver now handles these devices, regardless of what protocol the device claims it supports. Signed-off-by: Forest Bond <forest.bond@rapidrollout.com> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r--drivers/input/touchscreen/usbtouchscreen.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index 721fdb3..ae4b6b9 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -146,12 +146,10 @@ enum {
#define USB_DEVICE_HID_CLASS(vend, prod) \
.match_flags = USB_DEVICE_ID_MATCH_INT_CLASS \
- | USB_DEVICE_ID_MATCH_INT_PROTOCOL \
| USB_DEVICE_ID_MATCH_DEVICE, \
.idVendor = (vend), \
.idProduct = (prod), \
- .bInterfaceClass = USB_INTERFACE_CLASS_HID, \
- .bInterfaceProtocol = USB_INTERFACE_PROTOCOL_MOUSE
+ .bInterfaceClass = USB_INTERFACE_CLASS_HID
static const struct usb_device_id usbtouch_devices[] = {
#ifdef CONFIG_TOUCHSCREEN_USB_EGALAX
OpenPOWER on IntegriCloud