From: Forest Bond <forest.bond@rapidrollout.com>
Date: Mon, 21 Oct 2013 16:38:18 +0000 (-0400)
Subject: Input: usbtouchscreen: ignore eGalax/D-Wav/EETI HIDs
X-Git-Tag: firefly_0821_release~176^2~4950^2^6~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ae2aa3a512fa5f50f67feba9e66bc2efb394bd63;p=firefly-linux-kernel-4.4.55.git

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>
---

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 {
 
 #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