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.tissoi...@redhat.com>
---
 drivers/hid/wacom_sys.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 499cc82..9e283aa 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;
-- 
2.5.5

Reply via email to