2 files changed, 15 insertions, 4 deletions

diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index f22b88d03c6c..a1770e6feeec 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/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/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index 3f4b89d51fe2..8590b1e8ec37 100644
--- a/drivers/input/tablet/wacom_wac.h
+++ b/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;
 };