linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/2] Input: usbtouchscreen: ignore eGalax/D-Wav/EETI HIDs
@ 2013-10-21 16:38 Forest Bond
  2013-11-05  9:53 ` Jiri Kosina
  0 siblings, 1 reply; 5+ messages in thread
From: Forest Bond @ 2013-10-21 16:38 UTC (permalink / raw)
  To: Dmitry Torokhov
  Cc: linux-input, Sebastian Dalfuß, Daniel Ritz, Max Weninger,
	Jiri Kosina, Christian Engelmayer

From: Forest Bond <forest.bond@rapidrollout.com>

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

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH 2/2] Input: usbtouchscreen: ignore eGalax/D-Wav/EETI HIDs
  2013-10-21 16:38 [PATCH 2/2] Input: usbtouchscreen: ignore eGalax/D-Wav/EETI HIDs Forest Bond
@ 2013-11-05  9:53 ` Jiri Kosina
  2013-11-08 17:49   ` Dmitry Torokhov
  0 siblings, 1 reply; 5+ messages in thread
From: Jiri Kosina @ 2013-11-05  9:53 UTC (permalink / raw)
  To: Forest Bond
  Cc: Dmitry Torokhov, linux-input, Sebastian Dalfuß, Daniel Ritz,
	Max Weninger, Christian Engelmayer

On Mon, 21 Oct 2013, Forest Bond wrote:

> From: Forest Bond <forest.bond@rapidrollout.com>
> 
> 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>

Dmitry,

could you please Ack this, so that it can be applied together with 1/2? 
Thanks!

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 2/2] Input: usbtouchscreen: ignore eGalax/D-Wav/EETI HIDs
  2013-11-05  9:53 ` Jiri Kosina
@ 2013-11-08 17:49   ` Dmitry Torokhov
  2013-11-11 10:21     ` Jiri Kosina
  0 siblings, 1 reply; 5+ messages in thread
From: Dmitry Torokhov @ 2013-11-08 17:49 UTC (permalink / raw)
  To: Jiri Kosina
  Cc: Forest Bond, linux-input, Sebastian Dalfuß, Daniel Ritz,
	Max Weninger, Christian Engelmayer

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@rapidrollout.com>
> > 
> > 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>
> 
> 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@gmail.com>


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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 2/2] Input: usbtouchscreen: ignore eGalax/D-Wav/EETI HIDs
  2013-11-08 17:49   ` Dmitry Torokhov
@ 2013-11-11 10:21     ` Jiri Kosina
  2013-11-11 13:06       ` Forest Bond
  0 siblings, 1 reply; 5+ messages in thread
From: Jiri Kosina @ 2013-11-11 10:21 UTC (permalink / raw)
  To: Dmitry Torokhov
  Cc: Forest Bond, linux-input, Sebastian Dalfuß, Daniel Ritz,
	Max Weninger, Christian Engelmayer

On Fri, 8 Nov 2013, Dmitry Torokhov wrote:

> > > From: Forest Bond <forest.bond@rapidrollout.com>
> > > 
> > > 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>
> > 
> > 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@gmail.com>

Thanks, I have applied both patches now.

-- 
Jiri Kosina
SUSE Labs

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 2/2] Input: usbtouchscreen: ignore eGalax/D-Wav/EETI HIDs
  2013-11-11 10:21     ` Jiri Kosina
@ 2013-11-11 13:06       ` Forest Bond
  0 siblings, 0 replies; 5+ messages in thread
From: Forest Bond @ 2013-11-11 13:06 UTC (permalink / raw)
  To: Jiri Kosina
  Cc: Dmitry Torokhov, linux-input, Sebastian Dalfuß, Daniel Ritz,
	Max Weninger, Christian Engelmayer

[-- Attachment #1: Type: text/plain, Size: 761 bytes --]

Hi,

On Mon, Nov 11, 2013 at 11:21:42AM +0100, Jiri Kosina wrote:
> On Fri, 8 Nov 2013, Dmitry Torokhov wrote:
> 
> > > > From: Forest Bond <forest.bond@rapidrollout.com>
> > > > 
> > > > 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>
> > > 
> > > 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@gmail.com>
> 
> Thanks, I have applied both patches now.

Thanks for your help, Dmitry and Jiri.

-Forest

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2013-11-11 13:23 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-21 16:38 [PATCH 2/2] Input: usbtouchscreen: ignore eGalax/D-Wav/EETI HIDs Forest Bond
2013-11-05  9:53 ` Jiri Kosina
2013-11-08 17:49   ` Dmitry Torokhov
2013-11-11 10:21     ` Jiri Kosina
2013-11-11 13:06       ` Forest Bond

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).