2 files changed, 10 insertions, 20 deletions

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index d6797535fff9..6b67c6907caa 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -362,16 +362,6 @@ static void wacom_usage_mapping(struct hid_device *hdev,
                 return;
 
         /*
-         * Bamboo models do not support HID_DG_CONTACTMAX.
-         * And, Bamboo Pen only descriptor contains touch.
-         */
-        if (features->type > BAMBOO_PT) {
-                /* ISDv4 touch devices at least supports one touch point */
-                if (finger && !features->touch_max)
-                        features->touch_max = 1;
-        }
-
-        /*
          * ISDv4 devices which predate HID's adoption of the
          * HID_DG_BARELSWITCH2 usage use 0x000D0000 in its
          * position instead. We can accurately detect if a
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 0bb44d0088ed..e0842241f692 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -4351,19 +4351,19 @@ static const struct wacom_features wacom_features_0x5E =
           .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
 static const struct wacom_features wacom_features_0x90 =
         { "Wacom ISDv4 90", 26202, 16325, 255, 0,
-          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; /* Pen-only */
 static const struct wacom_features wacom_features_0x93 =
         { "Wacom ISDv4 93", 26202, 16325, 255, 0,
-          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 1 };
 static const struct wacom_features wacom_features_0x97 =
         { "Wacom ISDv4 97", 26202, 16325, 511, 0,
-          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; /* Pen-only */
 static const struct wacom_features wacom_features_0x9A =
         { "Wacom ISDv4 9A", 26202, 16325, 255, 0,
-          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 1 };
 static const struct wacom_features wacom_features_0x9F =
         { "Wacom ISDv4 9F", 26202, 16325, 255, 0,
-          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 1 };
 static const struct wacom_features wacom_features_0xE2 =
         { "Wacom ISDv4 E2", 26202, 16325, 255, 0,
           TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
@@ -4378,13 +4378,13 @@ static const struct wacom_features wacom_features_0xE6 =
           TABLETPC2FG, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 2 };
 static const struct wacom_features wacom_features_0xEC =
         { "Wacom ISDv4 EC", 25710, 14500, 255, 0,
-          TABLETPC,    WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          TABLETPC,    WACOM_INTUOS_RES, WACOM_INTUOS_RES }; /* Pen-only */
 static const struct wacom_features wacom_features_0xED =
         { "Wacom ISDv4 ED", 26202, 16325, 255, 0,
-          TABLETPCE, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          TABLETPCE, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 1 };
 static const struct wacom_features wacom_features_0xEF =
         { "Wacom ISDv4 EF", 26202, 16325, 255, 0,
-          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; /* Pen-only */
 static const struct wacom_features wacom_features_0x100 =
         { "Wacom ISDv4 100", 26202, 16325, 255, 0,
           MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -4402,10 +4402,10 @@ static const struct wacom_features wacom_features_0x10F =
           MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x116 =
         { "Wacom ISDv4 116", 26202, 16325, 255, 0,
-          TABLETPCE, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          TABLETPCE, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 1 };
 static const struct wacom_features wacom_features_0x12C =
         { "Wacom ISDv4 12C", 27848, 15752, 2047, 0,
-          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; /* Pen-only */
 static const struct wacom_features wacom_features_0x4001 =
         { "Wacom ISDv4 4001", 26202, 16325, 255, 0,
           MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };