Correct minor upstream differences

Accidentally introduced when cleaning up code for 4.18+ Fixes: ce3eb87 ("Clean up source code for 4.18+") Signed-off-by: Jason Gerecke <[email protected]>
linuxwacom · Sep 4, 2024 · a865de8 · a865de8
1 parent f7b524f
commit a865de8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
-Original file line number
+Diff line change
@@ Expand Up @@
     			remote->remotes[i].serial = 0;
     			remote->remotes[i].group.name = NULL;
     			wacom->led.groups[i].select = WACOM_STATUS_UNKNOWN;
     		}
     	}
@@ Expand Down @@