diff mbox

Input: wacom: Fix "can not retrieve extra class descriptor" for 24HDT

Message ID 1365029572-1527-1-git-send-email-killertofu@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Gerecke, Jason April 3, 2013, 10:52 p.m. UTC
The MFT device in the Cintiq 24HDT has two interfaces sharing the
same configuration. Without this patch, the driver attempts to
make use of both interfaces, even though the second interface is
not compatible with this driver.

Signed-off-by: Jason Gerecke <killertofu@gmail.com>
---
 drivers/input/tablet/wacom_wac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Dmitry Torokhov April 8, 2013, 4:08 a.m. UTC | #1
On Fri, Apr 05, 2013 at 03:55:13PM -0700, Ping Cheng wrote:
> On Wed, Apr 3, 2013 at 3:52 PM, Jason Gerecke <killertofu@gmail.com> wrote:
> 
> > The MFT device in the Cintiq 24HDT has two interfaces sharing the
> > same configuration. Without this patch, the driver attempts to
> > make use of both interfaces, even though the second interface is
> > not compatible with this driver.
> >
> > Signed-off-by: Jason Gerecke <killertofu@gmail.com>
> >
> 
> Tested-by: Ping Cheng <pingc@wacom.com>

Applied, thank you Jason and Ping.
diff mbox

Patch

diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 1daa979..ed78be9 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -2209,7 +2209,7 @@  const struct usb_device_id wacom_ids[] = {
 	{ USB_DEVICE_WACOM(0x47) },
 	{ USB_DEVICE_WACOM(0xF4) },
 	{ USB_DEVICE_WACOM(0xF8) },
-	{ USB_DEVICE_WACOM(0xF6) },
+	{ USB_DEVICE_DETAILED(0xF6, USB_CLASS_HID, 0, 0) },
 	{ USB_DEVICE_WACOM(0xFA) },
 	{ USB_DEVICE_LENOVO(0x6004) },
 	{ }