---

yaml --- r: 311694 b: refs/heads/master c: 1cecc5c h: refs/heads/master v: v3
git-mirror · Jun 29, 2012 · 7ed4963 · 7ed4963
1 parent 9e7300a
commit 7ed4963
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;
 			}