* [PATCH] hid: Remove duplicate ID for QUANTA 3001 touchscreen
@ 2012-08-23 10:12 Simon Farnsworth
2012-08-23 16:45 ` Henrik Rydberg
0 siblings, 1 reply; 3+ messages in thread
From: Simon Farnsworth @ 2012-08-23 10:12 UTC (permalink / raw)
To: linux-input
Cc: Benjamin Tissoires, Benjamin Tissoires, Jiri Kosina,
Henrik Rydberg, Simon Farnsworth
For some reason, we had two IDs for the QUANTA 3001 touchscreen controller,
one USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001 and one
USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN. As this has caused
confusion, remove USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN
completely, and fix places where it was used to refer to
USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001.
Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
---
Henrik suggested removing the duplicate IDs from the QUANTA devices.
I've torn out the PIXART one, as we have a vendor ID for PIXART, and I
suspect that it's simply that PIXART sold a rebranded QUANTA device for a
while, and the first example of the QUANTA controller was under PIXART
branding.
drivers/hid/hid-ids.h | 1 -
drivers/hid/usbhid/hid-quirks.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 1dcb76f..d615ecb 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -652,7 +652,6 @@
#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH 0x3000
#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001 0x3001
#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008 0x3008
-#define USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN 0x3001
#define USB_VENDOR_ID_ROCCAT 0x1e7d
#define USB_DEVICE_ID_ROCCAT_ARVO 0x30d4
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 903eef3..58bd4f2 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -74,7 +74,7 @@ static const struct hid_blacklist {
{ USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS },
{ USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2, HID_QUIRK_NO_INIT_REPORTS },
{ USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET },
- { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NOGET },
+ { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001, HID_QUIRK_NOGET },
{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET },
{ USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET },
{ USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
--
1.7.11.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] hid: Remove duplicate ID for QUANTA 3001 touchscreen
2012-08-23 10:12 [PATCH] hid: Remove duplicate ID for QUANTA 3001 touchscreen Simon Farnsworth
@ 2012-08-23 16:45 ` Henrik Rydberg
2012-08-27 14:55 ` Jiri Kosina
0 siblings, 1 reply; 3+ messages in thread
From: Henrik Rydberg @ 2012-08-23 16:45 UTC (permalink / raw)
To: Simon Farnsworth
Cc: linux-input, Benjamin Tissoires, Benjamin Tissoires, Jiri Kosina,
Henrik Rydberg
On Thu, Aug 23, 2012 at 11:12:47AM +0100, Simon Farnsworth wrote:
> For some reason, we had two IDs for the QUANTA 3001 touchscreen controller,
> one USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001 and one
> USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN. As this has caused
> confusion, remove USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN
> completely, and fix places where it was used to refer to
> USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001.
>
> Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
> ---
> Henrik suggested removing the duplicate IDs from the QUANTA devices.
>
> I've torn out the PIXART one, as we have a vendor ID for PIXART, and I
> suspect that it's simply that PIXART sold a rebranded QUANTA device for a
> while, and the first example of the QUANTA controller was under PIXART
> branding.
>
> drivers/hid/hid-ids.h | 1 -
> drivers/hid/usbhid/hid-quirks.c | 2 +-
> 2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index 1dcb76f..d615ecb 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -652,7 +652,6 @@
> #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH 0x3000
> #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001 0x3001
> #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008 0x3008
> -#define USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN 0x3001
>
> #define USB_VENDOR_ID_ROCCAT 0x1e7d
> #define USB_DEVICE_ID_ROCCAT_ARVO 0x30d4
> diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
> index 903eef3..58bd4f2 100644
> --- a/drivers/hid/usbhid/hid-quirks.c
> +++ b/drivers/hid/usbhid/hid-quirks.c
> @@ -74,7 +74,7 @@ static const struct hid_blacklist {
> { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS },
> { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2, HID_QUIRK_NO_INIT_REPORTS },
> { USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET },
> - { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NOGET },
> + { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001, HID_QUIRK_NOGET },
> { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET },
> { USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET },
> { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
> --
> 1.7.11.2
>
Excellent, thank you Simon.
Acked-by: Henrik Rydberg <rydberg@euromail.se>
Henrik
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] hid: Remove duplicate ID for QUANTA 3001 touchscreen
2012-08-23 16:45 ` Henrik Rydberg
@ 2012-08-27 14:55 ` Jiri Kosina
0 siblings, 0 replies; 3+ messages in thread
From: Jiri Kosina @ 2012-08-27 14:55 UTC (permalink / raw)
To: Henrik Rydberg
Cc: Simon Farnsworth, linux-input, Benjamin Tissoires,
Benjamin Tissoires, Henrik Rydberg
On Thu, 23 Aug 2012, Henrik Rydberg wrote:
> > For some reason, we had two IDs for the QUANTA 3001 touchscreen controller,
> > one USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001 and one
> > USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN. As this has caused
> > confusion, remove USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN
> > completely, and fix places where it was used to refer to
> > USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001.
> >
> > Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
> > ---
> > Henrik suggested removing the duplicate IDs from the QUANTA devices.
> >
> > I've torn out the PIXART one, as we have a vendor ID for PIXART, and I
> > suspect that it's simply that PIXART sold a rebranded QUANTA device for a
> > while, and the first example of the QUANTA controller was under PIXART
> > branding.
> >
> > drivers/hid/hid-ids.h | 1 -
> > drivers/hid/usbhid/hid-quirks.c | 2 +-
> > 2 files changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> > index 1dcb76f..d615ecb 100644
> > --- a/drivers/hid/hid-ids.h
> > +++ b/drivers/hid/hid-ids.h
> > @@ -652,7 +652,6 @@
> > #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH 0x3000
> > #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001 0x3001
> > #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008 0x3008
> > -#define USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN 0x3001
> >
> > #define USB_VENDOR_ID_ROCCAT 0x1e7d
> > #define USB_DEVICE_ID_ROCCAT_ARVO 0x30d4
> > diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
> > index 903eef3..58bd4f2 100644
> > --- a/drivers/hid/usbhid/hid-quirks.c
> > +++ b/drivers/hid/usbhid/hid-quirks.c
> > @@ -74,7 +74,7 @@ static const struct hid_blacklist {
> > { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS },
> > { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2, HID_QUIRK_NO_INIT_REPORTS },
> > { USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET },
> > - { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NOGET },
> > + { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001, HID_QUIRK_NOGET },
> > { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET },
> > { USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET },
> > { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
> > --
> > 1.7.11.2
> >
>
> Excellent, thank you Simon.
>
> Acked-by: Henrik Rydberg <rydberg@euromail.se>
Applied, thank you guys.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-08-27 14:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-23 10:12 [PATCH] hid: Remove duplicate ID for QUANTA 3001 touchscreen Simon Farnsworth
2012-08-23 16:45 ` Henrik Rydberg
2012-08-27 14:55 ` Jiri Kosina
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).