---

yaml
---
r: 183135
b: refs/heads/master
c: 49b764a
h: refs/heads/master
i:
  183133: 7a2cd71
  183131: 45e4972
  183127: a905659
  183119: 7e9ea27
  183103: 23a2060
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23c239be223d7427da51656d6f196bde965d9796
+refs/heads/master: 49b764aebde6ceea393f56cd3449bfa5720f8383

trunk/drivers/input/tablet/wacom_sys.c

@@ -592,7 +592,17 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
 	if (error)
 		goto fail2;
 
-	input_dev->name = features->name;
+	strlcpy(wacom_wac->name, features->name, sizeof(wacom_wac->name));
+
+	if (features->type == TABLETPC || features->type == TABLETPC2FG) {
+		/* Append the device type to the name */
+		strlcat(wacom_wac->name,
+			features->device_type == BTN_TOOL_PEN ?
+				" Pen" : " Finger",
+			sizeof(wacom_wac->name));
+	}
+
+	input_dev->name = wacom_wac->name;
 	wacom->wacom_wac = wacom_wac;
 
 	input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);

trunk/drivers/input/tablet/wacom_wac.h

@@ -73,10 +73,11 @@ struct wacom_features {
 };
 
 struct wacom_wac {
+	char name[64];
 	unsigned char *data;
-        int tool[2];
-        int id[2];
-        __u32 serial[2];
+	int tool[2];
+	int id[2];
+	__u32 serial[2];
 	struct wacom_features features;
 };