HID: wacom: convert Wacom custom usages to standard HID usages
authorPing Cheng <pingc@wacom.com>
Mon, 25 Jun 2018 20:24:36 +0000 (13:24 -0700)
committerJiri Kosina <jkosina@suse.cz>
Tue, 3 Jul 2018 10:07:52 +0000 (12:07 +0200)
Otherwise the switch would not catch the proper usages.

Signed-off-by: Ping Cheng <ping.cheng@wacom.com>
Reviewed-by: Ping Cheng <ping.cheng@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/wacom_sys.c

index 3a4cf26..52e85d2 100644 (file)
@@ -394,6 +394,7 @@ static void wacom_usage_mapping(struct hid_device *hdev,
        struct wacom_features *features = &wacom->wacom_wac.features;
        bool finger = WACOM_FINGER_FIELD(field);
        bool pen = WACOM_PEN_FIELD(field);
+       unsigned equivalent_usage = wacom_equivalent_usage(usage->hid);
 
        /*
        * Requiring Stylus Usage will ignore boot mouse
@@ -409,7 +410,7 @@ static void wacom_usage_mapping(struct hid_device *hdev,
 
        wacom_hid_usage_quirk(hdev, field, usage);
 
-       switch (usage->hid) {
+       switch (equivalent_usage) {
        case HID_GD_X:
                features->x_max = field->logical_maximum;
                if (finger) {