From a865de8d411354a611e2ef793fc1a6cb9cd22c78 Mon Sep 17 00:00:00 2001 From: Jason Gerecke Date: Wed, 4 Sep 2024 15:37:26 -0700 Subject: [PATCH] Correct minor upstream differences Accidentally introduced when cleaning up code for 4.18+ Fixes: ce3eb879f291 ("Clean up source code for 4.18+") Signed-off-by: Jason Gerecke --- 4.18/wacom_sys.c | 1 - 4.18/wacom_wac.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/4.18/wacom_sys.c b/4.18/wacom_sys.c index 25c6d354..66354802 100644 --- a/4.18/wacom_sys.c +++ b/4.18/wacom_sys.c @@ -2613,7 +2613,6 @@ static void wacom_remote_destroy_one(struct wacom *wacom, unsigned int index) remote->remotes[i].serial = 0; remote->remotes[i].group.name = NULL; - wacom->led.groups[i].select = WACOM_STATUS_UNKNOWN; } } diff --git a/4.18/wacom_wac.c b/4.18/wacom_wac.c index 84bc8761..7551671c 100644 --- a/4.18/wacom_wac.c +++ b/4.18/wacom_wac.c @@ -1893,8 +1893,9 @@ static void wacom_map_usage(struct input_dev *input, struct hid_usage *usage, int resolution_code = code; int resolution = hidinput_calc_abs_res(field, resolution_code); - if (equivalent_usage == HID_DG_TWIST) + if (equivalent_usage == HID_DG_TWIST) { resolution_code = ABS_RZ; + } if (equivalent_usage == HID_GD_X) { fmin += features->offset_left;