diff options
| author |   Ping Cheng <pinglinux@gmail.com> | 2016-05-02 21:17:34 -0700 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2016-05-03 12:03:44 +0200 |
| commit | eff6ca97998386447b795362cc20213114af2870 (patch) | |
| tree | ba335b07ca01bc31a1050936c798a4ae9af7d1f3 /drivers/hid | |
| parent | HID: Fix boot delay for Creative SB Omni Surround 5.1 with quirk (diff) | |
| download | linux-dev-eff6ca97998386447b795362cc20213114af2870.tar.xz linux-dev-eff6ca97998386447b795362cc20213114af2870.zip | |
HID: wacom: add missed stylus_in_proximity line back
Commit 7e12978 ("HID: wacom: break out wacom_intuos_get_tool_type") by accident
removed stylus_in_proximity flag for Intuos series while shuffling the code
around.
Fix that by reintroducing that flag setting in wacom_intuos_inout(), where
it originally was.
Fixes: 7e12978 ("HID: wacom: break out wacom_intuos_get_tool_type")
Signed-off-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_wac.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index e9902f2f8ec9..cf2ba43453fd 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -684,6 +684,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) wacom->tool[idx] = wacom_intuos_get_tool_type(wacom->id[idx]); + wacom->shared->stylus_in_proximity = true; return 1; } |