On Tue, Nov 05, 2013 at 10:53:10AM +0100, Jiri Kosina wrote: > On Mon, 21 Oct 2013, Forest Bond wrote: > > > From: Forest Bond <forest.bond@xxxxxxxxxxxxxxxx> > > > > The HID driver now handles these devices, regardless of what protocol > > the device claims it supports. > > > > Signed-off-by: Forest Bond <forest.bond@xxxxxxxxxxxxxxxx> > > Dmitry, > > could you please Ack this, so that it can be applied together with 1/2? > Thanks! Jiri, Sorry for the delay. Yes, please merge through your tree. Acked-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx> > > > --- > > drivers/input/touchscreen/usbtouchscreen.c | 4 +--- > > 1 file changed, 1 insertion(+), 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 > > -- > > 1.7.9.5 > > > > -- > Jiri Kosina > SUSE Labs -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html