Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2209d4a authored by Jason Gerecke's avatar Jason Gerecke Committed by Jiri Kosina
Browse files

HID: wacom: generic: Strip off excessive name prefixing 



The product name received from the string descriptor in the new MobileStudio
Pro line of tablets begins with "Wacom", which leads to unnecessary visual
noise in the device name when appended to the vendor name which also includes
"Wacom". Look for and fix cases like this.

Signed-off-by: default avatarJason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 6005a13c

drivers/hid/wacom_sys.c

+13 −0
Original line number Diff line number Diff line
@@ -1940,6 +1940,19 @@ static void wacom_update_name(struct wacom *wacom, const char *suffix) 
				/* shift everything including the terminator */

				memmove(gap, gap+1, strlen(gap));

			}



			/* strip off excessive prefixing */

			if (strstr(name, "Wacom Co.,Ltd. Wacom ") == name) {

				int n = strlen(name);

				int x = strlen("Wacom Co.,Ltd. ");

				memmove(name, name+x, n-x+1);

			}

			if (strstr(name, "Wacom Co., Ltd. Wacom ") == name) {

				int n = strlen(name);

				int x = strlen("Wacom Co., Ltd. ");

				memmove(name, name+x, n-x+1);

			}



			/* get rid of trailing whitespace */

			if (name[strlen(name)-1] == ' ')

				name[strlen(name)-1] = '\0';