diff options
| author | Jason Gerecke <jason.gerecke@wacom.com> | 2019-08-07 14:11:55 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-29 08:28:49 +0200 |
| commit | 375c6c72f56cb2468595c365c82af2fa640d6430 (patch) | |
| tree | 5f0a374a991ee2674bdc7b5a3c7e5665dfd555b9 /drivers/hid | |
| parent | 8317fe4a39066fbbee69dca5d848e10c4b40eeb6 (diff) | |
| download | linux-stable-375c6c72f56cb2468595c365c82af2fa640d6430.tar.gz linux-stable-375c6c72f56cb2468595c365c82af2fa640d6430.tar.bz2 linux-stable-375c6c72f56cb2468595c365c82af2fa640d6430.zip | |
HID: wacom: Correct distance scale for 2nd-gen Intuos devices
commit b72fb1dcd2ea9d29417711cb302cef3006fa8d5a upstream.
Distance values reported by 2nd-gen Intuos tablets are on an inverted
scale (0 == far, 63 == near). We need to change them over to a normal
scale before reporting to userspace or else userspace drivers and
applications can get confused.
Ref: https://github.com/linuxwacom/input-wacom/issues/98
Fixes: eda01dab53 ("HID: wacom: Add four new Intuos devices")
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Cc: <stable@vger.kernel.org> # v4.4+
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/wacom_wac.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index c46aab6319c4..50ef7b6cd195 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -848,6 +848,8 @@ static int wacom_intuos_general(struct wacom_wac *wacom) y >>= 1; distance >>= 1; } + if (features->type == INTUOSHT2) + distance = features->distance_max - distance; input_report_abs(input, ABS_X, x); input_report_abs(input, ABS_Y, y); input_report_abs(input, ABS_DISTANCE, distance); |