diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2016-07-13 18:05:49 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-08-05 13:39:11 +0200 |
| commit | 97f9afa4f9cc5e88e092e47ebd17ebf3f764a582 (patch) | |
| tree | a994a1feb8fa1ed3128b65a9d8ba024c93e9426a /drivers/hid | |
| parent | d453b87612a0aba6ca6ec85447eeefa220cadec5 (diff) | |
| download | linux-97f9afa4f9cc5e88e092e47ebd17ebf3f764a582.tar.gz linux-97f9afa4f9cc5e88e092e47ebd17ebf3f764a582.tar.bz2 linux-97f9afa4f9cc5e88e092e47ebd17ebf3f764a582.zip | |
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 <benjamin.tissoires@redhat.com>
Acked-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/wacom_sys.c | 5 |
1 files changed, 3 insertions, 2 deletions
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; |