From: Benjamin Tissoires Date: Wed, 13 Jul 2016 16:05:49 +0000 (+0200) Subject: HID: wacom: store the type in wacom->shared for INTUOSHT and INTUOSHT2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=97f9afa4f9cc5e88e092e47ebd17ebf3f764a582;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git HID: wacom: store the type in wacom->shared for INTUOSHT and INTUOSHT2 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 Acked-by: Ping Cheng Signed-off-by: Jiri Kosina --- diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 499cc8213cfe..9e283aaa6bad 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -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;