From 0dd37baed731295db4d0c8d162eb2a6155209e6c Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Wed, 23 Nov 2011 10:54:34 +0100 Subject: [PATCH] --- yaml --- r: 282299 b: refs/heads/master c: 1b723e8dc81b23141bfb8991e002073b17fd0199 h: refs/heads/master i: 282297: 5c677dc2c99515a7032a689a936519a91553a1d2 282295: f349f3bc11bf4984bbea6f0f2327979da1893a43 v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-multitouch.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ce9a24f7e7a3..9403db93e2e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66f06127f34ad6e8a1b24a2c03144b694d19f99f +refs/heads/master: 1b723e8dc81b23141bfb8991e002073b17fd0199 diff --git a/trunk/drivers/hid/hid-multitouch.c b/trunk/drivers/hid/hid-multitouch.c index fd2fa5977831..26e9706eedf5 100644 --- a/trunk/drivers/hid/hid-multitouch.c +++ b/trunk/drivers/hid/hid-multitouch.c @@ -97,6 +97,7 @@ struct mt_device { #define MT_CLS_3M 0x0101 #define MT_CLS_CYPRESS 0x0102 #define MT_CLS_EGALAX 0x0103 +#define MT_CLS_EGALAX_SERIAL 0x0104 #define MT_DEFAULT_MAXCONTACT 10 @@ -174,6 +175,12 @@ struct mt_class mt_classes[] = { .sn_move = 4096, .sn_pressure = 32, }, + { .name = MT_CLS_EGALAX_SERIAL, + .quirks = MT_QUIRK_SLOT_IS_CONTACTID | + MT_QUIRK_ALWAYS_VALID, + .sn_move = 4096, + .sn_pressure = 32, + }, { } }; @@ -705,7 +712,7 @@ static const struct hid_device_id mt_devices[] = { { .driver_data = MT_CLS_EGALAX, HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302) }, - { .driver_data = MT_CLS_EGALAX, + { .driver_data = MT_CLS_EGALAX_SERIAL, HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },