From 7ed49631b2b5d3919a1900a95d85f474bf6ab665 Mon Sep 17 00:00:00 2001
From: Ping Cheng <pinglinux@gmail.com>
Date: Thu, 28 Jun 2012 16:47:30 -0700
Subject: [PATCH] --- yaml --- r: 311694 b: refs/heads/master c:
 1cecc5cc0658e128bcad0b29edb96f286066571d h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/input/tablet/wacom_sys.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 04f680e1a305..d02f27f4a399 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61c91dd4a58b21a783e37208f4d02e3cb4b637c4
+refs/heads/master: 1cecc5cc0658e128bcad0b29edb96f286066571d
diff --git a/trunk/drivers/input/tablet/wacom_sys.c b/trunk/drivers/input/tablet/wacom_sys.c
index 23a933da75cd..b145841bdbe7 100644
--- a/trunk/drivers/input/tablet/wacom_sys.c
+++ b/trunk/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;
 			}