1 files changed, 25 insertions, 0 deletions

diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index d7713388a953..1c874adb7053 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -233,6 +233,9 @@ static int wacom_parse_logical_collection(unsigned char *report,
  * 3rd gen Bamboo Touch no longer define a Digitizer-Finger Pysical
  * Collection. Instead they define a Logical Collection with a single
  * Logical Maximum for both X and Y.
+ *
+ * Intuos5 touch interface does not contain useful data. We deal with
+ * this after returning from this function.
  */
 static int wacom_parse_hid(struct usb_interface *intf,
                            struct hid_descriptor *hid_desc,
@@ -1085,6 +1088,28 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
         if (error)
                 goto fail3;
 
+        /*
+         * Intuos5 has no useful data about its touch interface in its
+         * HID descriptor. If this is the touch interface (wMaxPacketSize
+         * of WACOM_PKGLEN_BBTOUCH3), override the table values.
+         */
+        if (features->type >= INTUOS5S && features->type <= INTUOS5L) {
+                if (endpoint->wMaxPacketSize == WACOM_PKGLEN_BBTOUCH3) {
+                        features->device_type = BTN_TOOL_FINGER;
+                        features->pktlen = WACOM_PKGLEN_BBTOUCH3;
+
+                        features->x_phy =
+                                (features->x_max * 100) / features->x_resolution;
+                        features->y_phy =
+                                (features->y_max * 100) / features->y_resolution;
+
+                        features->x_max = 4096;
+                        features->y_max = 4096;
+                } else {
+                        features->device_type = BTN_TOOL_PEN;
+                }
+        }
+
         wacom_setup_device_quirks(features);
 
         strlcpy(wacom_wac->name, features->name, sizeof(wacom_wac->name));