From: Daniel Kurtz <djkurtz@chromium.org>
Date: Tue, 20 Mar 2012 18:11:52 +0000 (+0800)
Subject: CHROMIUM: Input: atmel_mxt_ts - make size/instances u16
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=2625374aa297da4e6bbc1c221eb61b9f09cbac91;p=cascardo%2Flinux.git

CHROMIUM: Input: atmel_mxt_ts - make size/instances u16

Previously size and instances fields were u8 but could hold up to a value
of 255.  Since we now +1 to size and instances, they must be u16 to hold
the full size of up to 256.

Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>

BUG=chromium-os:27713
TEST=Confirm object table is read correctly:
     cat /sys/bus/i2c/devices/<dev>/object

Change-Id: Ib43baedf5c196b093713f2cec56f67e4ce93e60d
Reviewed-on: https://gerrit.chromium.org/gerrit/18548
Reviewed-by: Benson Leung <bleung@chromium.org>
Commit-Ready: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Tested-by: Daniel Kurtz <djkurtz@chromium.org>
---

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index a1fd20f26cbb..f8250a389671 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -236,8 +236,8 @@ struct mxt_info {
 struct mxt_object {
 	u8 type;
 	u16 start_address;
-	u8 size;
-	u8 instances;
+	u16 size;
+	u16 instances;
 	u8 num_report_ids;
 };