1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 3512d833cc24..2a221630d8dc 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -1130,7 +1130,7 @@ static struct input_dev *wacom_allocate_input(struct wacom *wacom)
         if (!input_dev)
                 return NULL;
 
-        input_dev->name = wacom_wac->pen_name;
+        input_dev->name = wacom_wac->features.name;
         input_dev->phys = hdev->phys;
         input_dev->dev.parent = &hdev->dev;
         input_dev->open = wacom_open;
@@ -1183,6 +1183,7 @@ static int wacom_allocate_inputs(struct wacom *wacom)
                 return -ENOMEM;
         }
 
+        wacom_wac->pen_input->name = wacom_wac->pen_name;
         wacom_wac->touch_input->name = wacom_wac->touch_name;
         wacom_wac->pad_input->name = wacom_wac->pad_name;