diff options
| author | Ping Cheng <pinglinux@gmail.com> | 2012-06-29 01:47:30 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-06-29 02:02:45 +0200 |
| commit | 1cecc5cc0658e128bcad0b29edb96f286066571d (patch) | |
| tree | 2c1bb27d19d6ddd974d32f15c8aaef0f7f96b16e /drivers/input | |
| parent | Input: wacom - fix retrieving touch_max bug (diff) | |
| download | linux-1cecc5cc0658e128bcad0b29edb96f286066571d.tar.xz linux-1cecc5cc0658e128bcad0b29edb96f286066571d.zip | |
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 <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>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/tablet/wacom_sys.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index 23a933da75cd..b145841bdbe7 100644 --- 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; } |