]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
HID: wacom: store the type in wacom->shared for INTUOSHT and INTUOSHT2
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>
Wed, 13 Jul 2016 16:05:49 +0000 (18:05 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 5 Aug 2016 11:39:11 +0000 (13:39 +0200)
The type is never set but we check for it in wacom_wireless_irq().
It looks like this is a big hack from the beginning, so fill in the gap
only.

Untested.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/wacom_sys.c

index 499cc8213cfe1627b95364f7143bd6f98e064eee..9e283aaa6badd68ac8eb9affc2ef3051a7faa634 100644 (file)
@@ -1720,9 +1720,10 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless)
                error = hid_hw_open(hdev);
 
        if ((wacom_wac->features.type == INTUOSHT ||
-           wacom_wac->features.type == INTUOSHT2) &&
+            wacom_wac->features.type == INTUOSHT2) &&
            (wacom_wac->features.device_type & WACOM_DEVICETYPE_TOUCH)) {
-                       wacom_wac->shared->touch_input = wacom_wac->touch_input;
+               wacom_wac->shared->type = wacom_wac->features.type;
+               wacom_wac->shared->touch_input = wacom_wac->touch_input;
        }
 
        return 0;