1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 0dad786d2135..d51daf581488 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -2987,8 +2987,6 @@ void wacom_setup_device_quirks(struct wacom *wacom)
         struct wacom_features *features = &wacom->wacom_wac.features;
 
         /* The pen and pad share the same interface on most devices */
-        if (features->numbered_buttons > 0)
-                features->device_type |= WACOM_DEVICETYPE_PAD;
         if (features->type == GRAPHIRE_BT || features->type == WACOM_G4 ||
             features->type == DTUS ||
             (features->type >= INTUOS3S && features->type <= WACOM_MO)) {
@@ -3527,6 +3525,9 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev,
 {
         struct wacom_features *features = &wacom_wac->features;
 
+        if ((features->type == HID_GENERIC) && features->numbered_buttons > 0)
+                features->device_type |= WACOM_DEVICETYPE_PAD;
+
         if (!(features->device_type & WACOM_DEVICETYPE_PAD))
                 return -ENODEV;