aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorForest Bond <forest.bond@rapidrollout.com>2013-10-21 12:38:18 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-04 13:57:18 -0500
commitc2dd82b43dcc08aad0e139e23509efb195ad6fc1 (patch)
tree4533df5fc2693a4e20594d836b56434648ed70a8
parent59f466a632b8502d2fb35b2cd119a061f8922021 (diff)
Input: usbtouchscreen: ignore eGalax/D-Wav/EETI HIDs
commit ae2aa3a512fa5f50f67feba9e66bc2efb394bd63 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 721fdb3597ca..ae4b6b903629 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -146,12 +146,10 @@ enum {
146 146
147#define USB_DEVICE_HID_CLASS(vend, prod) \ 147#define USB_DEVICE_HID_CLASS(vend, prod) \
148 .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS \ 148 .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS \
149 | USB_DEVICE_ID_MATCH_INT_PROTOCOL \
150 | USB_DEVICE_ID_MATCH_DEVICE, \ 149 | USB_DEVICE_ID_MATCH_DEVICE, \
151 .idVendor = (vend), \ 150 .idVendor = (vend), \
152 .idProduct = (prod), \ 151 .idProduct = (prod), \
153 .bInterfaceClass = USB_INTERFACE_CLASS_HID, \ 152 .bInterfaceClass = USB_INTERFACE_CLASS_HID
154 .bInterfaceProtocol = USB_INTERFACE_PROTOCOL_MOUSE
155 153
156static const struct usb_device_id usbtouch_devices[] = { 154static const struct usb_device_id usbtouch_devices[] = {
157#ifdef CONFIG_TOUCHSCREEN_USB_EGALAX 155#ifdef CONFIG_TOUCHSCREEN_USB_EGALAX