From 81c007c7fb23dbbc05918705a2376721a2d79804 Mon Sep 17 00:00:00 2001
From: Ping Cheng <pinglinux@gmail.com>
Date: Sat, 20 Feb 2010 00:53:49 -0800
Subject: [PATCH] --- yaml --- r: 183135 b: refs/heads/master c:
 49b764aebde6ceea393f56cd3449bfa5720f8383 h: refs/heads/master i:   183133:
 7a2cd716c97b5b9002b4a6f6f53e1eeffe29da2e   183131:
 45e4972a43538556eed02935321980ed9c7bf463   183127:
 a905659529dd37aa78b989b5733886cb10736d87   183119:
 7e9ea2755874d32fc4933b2ef95e203865512de8   183103:
 23a206070190ef9dd0b8831a09384f4d5984107a v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/input/tablet/wacom_sys.c | 12 +++++++++++-
 trunk/drivers/input/tablet/wacom_wac.h |  7 ++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4f5cd2a27c3e..53e35a12731b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23c239be223d7427da51656d6f196bde965d9796
+refs/heads/master: 49b764aebde6ceea393f56cd3449bfa5720f8383
diff --git a/trunk/drivers/input/tablet/wacom_sys.c b/trunk/drivers/input/tablet/wacom_sys.c
index f22b88d03c6c..a1770e6feeec 100644
--- a/trunk/drivers/input/tablet/wacom_sys.c
+++ b/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);
diff --git a/trunk/drivers/input/tablet/wacom_wac.h b/trunk/drivers/input/tablet/wacom_wac.h
index 3f4b89d51fe2..8590b1e8ec37 100644
--- a/trunk/drivers/input/tablet/wacom_wac.h
+++ b/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;
 };