diff options
author | Dom Cobley <popcornmix@gmail.com> | 2024-09-10 19:27:49 +0100 |
---|---|---|
committer | Dom Cobley <popcornmix@gmail.com> | 2024-09-10 19:27:49 +0100 |
commit | d6797632ac388bc94b2c2bc0ee95c878bbed1ad7 (patch) | |
tree | 4eeacb9b6921f829260d5e882372cbe9aada812b /drivers/hid | |
parent | 2c32c36dce781a05543997cd791b7e3feb56eafe (diff) | |
parent | ad07a29023cebd40848fce81e6732d671ede5fe6 (diff) | |
download | linux-rpi-d6797632ac388bc94b2c2bc0ee95c878bbed1ad7.tar.gz linux-rpi-d6797632ac388bc94b2c2bc0ee95c878bbed1ad7.tar.bz2 linux-rpi-d6797632ac388bc94b2c2bc0ee95c878bbed1ad7.zip |
Merge remote-tracking branch 'stable/linux-6.6.y' into rpi-6.6.y
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/wacom_wac.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index d2fe14ce423e..5db26a8af772 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -1924,12 +1924,14 @@ static void wacom_map_usage(struct input_dev *input, struct hid_usage *usage, int fmax = field->logical_maximum; unsigned int equivalent_usage = wacom_equivalent_usage(usage->hid); int resolution_code = code; - int resolution = hidinput_calc_abs_res(field, resolution_code); + int resolution; if (equivalent_usage == HID_DG_TWIST) { resolution_code = ABS_RZ; } + resolution = hidinput_calc_abs_res(field, resolution_code); + if (equivalent_usage == HID_GD_X) { fmin += features->offset_left; fmax -= features->offset_right; |