Merge branch 'for-6.10/uclogic' into for-linus

Jiri Kosina · Jiri Kosina · commit 51b012742caf · 2024-05-14T13:58:21.000+02:00
diff --git a/drivers/hid/hid-uclogic-params.c b/drivers/hid/hid-uclogic-params.c
@@ -884,6 +884,9 @@ static int uclogic_params_huion_init(struct uclogic_params *params,
 		goto cleanup;
 	}
 
+	/* The firmware is used in userspace as unique identifier */
+	strscpy(hdev->uniq, ver_ptr, sizeof(hdev->uniq));
+
 	/* If this is a transition firmware */
 	if (strcmp(ver_ptr, transition_ver) == 0) {
 		hid_dbg(hdev,

Original file line number	Diff line number	Diff line change
`@@ -884,6 +884,9 @@ static int uclogic_params_huion_init(struct uclogic_params *params,`
`884`	`884`	`goto cleanup;`
`885`	`885`	`}`
`886`	`886`
	`887`	`+ /* The firmware is used in userspace as unique identifier */`
	`888`	`+ strscpy(hdev->uniq, ver_ptr, sizeof(hdev->uniq));`
	`889`	`+`
`887`	`890`	`/* If this is a transition firmware */`
`888`	`891`	`if (strcmp(ver_ptr, transition_ver) == 0) {`
`889`	`892`	`hid_dbg(hdev,`