Skip to content

Commit

Permalink
Input: wacom - don't retrieve touch_max when it is predefined
Browse files Browse the repository at this point in the history
Some models, such as 0xE6, report more fingers than we process.

Reported-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Ping Cheng <pingc@wacom.com>
Tested-by: Nils Kanning <nils@kanning.de>
Tested-by: Rafi Rubin <rafi@seas.upenn.edu>
Reviewed-by: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  • Loading branch information
Ping Cheng authored and Dmitry Torokhov committed Jun 29, 2012
1 parent 61c91dd commit 1cecc5c
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/input/tablet/wacom_sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 1cecc5c

Please sign in to comment.