Input: wacom - don't retrieve touch_max when it is predefined

Some models, such as 0xE6, report more fingers than we process.

Reported-by: Jonathan Nieder <[email protected]>
Signed-off-by: Ping Cheng <[email protected]>
Tested-by: Nils Kanning <[email protected]>
Tested-by: Rafi Rubin <[email protected]>
Reviewed-by: Jason Gerecke <[email protected]>
Signed-off-by: Dmitry Torokhov <[email protected]>

diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 23a933da75cdcc50dd505a75d5dd201cfffbf676..b145841bdbe7daddbc8eb3745e94839434e978d4 100644 (file)
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -398,7 +398,9 @@ static int wacom_parse_hid(struct usb_interface *intf,
                                break;
 
                        case HID_USAGE_CONTACTMAX:
-                               wacom_retrieve_report_data(intf, features);
+                               /* leave touch_max as is if predefined */
+                               if (!features->touch_max)
+                                       wacom_retrieve_report_data(intf, features);
                                i++;
                                break;
                        }