diff options
author | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2013-01-31 11:22:29 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-02-05 06:07:41 -0500 |
commit | efc16787cf92de4906adae8e451c10c6189b4ca8 (patch) | |
tree | 7fb9e4105adc9b97afc586fba21e0eaf4a38eb13 /drivers/hid | |
parent | 51377fed20461ad857c020b7109efa8207200222 (diff) |
HID: multitouch: fix protocol for Cando 2087:0a02
Cando 2087:0a02 was broken, this fixes it.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-multitouch.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 4ea28de33d0a..e2fc1211f130 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c | |||
@@ -115,6 +115,7 @@ struct mt_device { | |||
115 | #define MT_CLS_DUAL_NSMU_CONTACTID 0x0008 | 115 | #define MT_CLS_DUAL_NSMU_CONTACTID 0x0008 |
116 | #define MT_CLS_INRANGE_CONTACTNUMBER 0x0009 | 116 | #define MT_CLS_INRANGE_CONTACTNUMBER 0x0009 |
117 | #define MT_CLS_ALWAYS_TRUE 0x000a | 117 | #define MT_CLS_ALWAYS_TRUE 0x000a |
118 | #define MT_CLS_DUAL_CONTACT_NUMBER 0x0010 | ||
118 | 119 | ||
119 | /* vendor specific classes */ | 120 | /* vendor specific classes */ |
120 | #define MT_CLS_3M 0x0101 | 121 | #define MT_CLS_3M 0x0101 |
@@ -177,6 +178,11 @@ static struct mt_class mt_classes[] = { | |||
177 | { .name = MT_CLS_ALWAYS_TRUE, | 178 | { .name = MT_CLS_ALWAYS_TRUE, |
178 | .quirks = MT_QUIRK_ALWAYS_VALID | | 179 | .quirks = MT_QUIRK_ALWAYS_VALID | |
179 | MT_QUIRK_CONTACT_CNT_ACCURATE }, | 180 | MT_QUIRK_CONTACT_CNT_ACCURATE }, |
181 | { .name = MT_CLS_DUAL_CONTACT_NUMBER, | ||
182 | .quirks = MT_QUIRK_ALWAYS_VALID | | ||
183 | MT_QUIRK_CONTACT_CNT_ACCURATE | | ||
184 | MT_QUIRK_SLOT_IS_CONTACTNUMBER, | ||
185 | .maxcontacts = 2 }, | ||
180 | 186 | ||
181 | /* | 187 | /* |
182 | * vendor specific classes | 188 | * vendor specific classes |
@@ -947,7 +953,7 @@ static const struct hid_device_id mt_devices[] = { | |||
947 | { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER, | 953 | { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER, |
948 | MT_USB_DEVICE(USB_VENDOR_ID_CANDO, | 954 | MT_USB_DEVICE(USB_VENDOR_ID_CANDO, |
949 | USB_DEVICE_ID_CANDO_MULTI_TOUCH) }, | 955 | USB_DEVICE_ID_CANDO_MULTI_TOUCH) }, |
950 | { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER, | 956 | { .driver_data = MT_CLS_DUAL_CONTACT_NUMBER, |
951 | MT_USB_DEVICE(USB_VENDOR_ID_CANDO, | 957 | MT_USB_DEVICE(USB_VENDOR_ID_CANDO, |
952 | USB_DEVICE_ID_CANDO_MULTI_TOUCH_10_1) }, | 958 | USB_DEVICE_ID_CANDO_MULTI_TOUCH_10_1) }, |
953 | { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER, | 959 | { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER, |