summaryrefslogtreecommitdiffstats
path: root/drivers/input/tablet
diff options
context:
space:
mode:
authorJason Gerecke2013-04-08 05:52:38 +0200
committerDmitry Torokhov2013-04-08 06:03:55 +0200
commite55b6a843b8a07b1c342f9155aa58d0274aef502 (patch)
tree2a4a8829adcdb6e90f5df6e65f74496da5c955ba /drivers/input/tablet
parentInput: mms114 - Fix regulator enable and disable paths (diff)
downloadkernel-qcow2-linux-e55b6a843b8a07b1c342f9155aa58d0274aef502.tar.gz
kernel-qcow2-linux-e55b6a843b8a07b1c342f9155aa58d0274aef502.tar.xz
kernel-qcow2-linux-e55b6a843b8a07b1c342f9155aa58d0274aef502.zip
Input: wacom - fix "can not retrieve extra class descriptor" for 24HDT
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> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/tablet')
-rw-r--r--drivers/input/tablet/wacom_wac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 1daa97913b7d..ed78be901b65 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) },
{ }