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

PATCH In review Ping Cheng 1 participant 1 message Jun 25, 2012

Subsystems (2)

HID Input drivers

lore

Share & tools

lore

Ping Cheng

author

2012-06-25 21:32 UTC #0 lore raw

PATCH 2/4 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]>

Tested-by Nils Kanning <[email protected]>

Signed-off-by Ping Cheng <[email protected]>

---
 drivers/input/tablet/wacom_sys.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

drivers/input/tablet/wacom_sys.c +3 -1

index c2fb698..2714ce6 100644
@@ -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;
 			}

Signature · 1 line

1.7.7.6