summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorIiro Valkonen <iiro.valkonen@atmel.com>2011-07-04 03:16:25 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-07-04 03:19:20 -0700
commita93d4f2d023ea5e84c0104d4e479243c6ac77d17 (patch)
tree134f15e404ce9549823d01b7010b4bf220da720f /drivers/input
parent81c88a711aef5552375c4296bb473fdf9b12273c (diff)
downloadlinux-stable-a93d4f2d023ea5e84c0104d4e479243c6ac77d17.tar.gz
linux-stable-a93d4f2d023ea5e84c0104d4e479243c6ac77d17.tar.bz2
linux-stable-a93d4f2d023ea5e84c0104d4e479243c6ac77d17.zip
Input: atmel_mxt_ts - handle objects with multiple instances correctly
Handle the objects with multiple instances correctly when the configuration data is loaded. Signed-off-by: Iiro Valkonen <iiro.valkonen@atmel.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/atmel_mxt_ts.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 5d71e4475934..ae00604a6a81 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -655,7 +655,9 @@ static int mxt_check_reg_init(struct mxt_data *data)
if (!mxt_object_writable(object->type))
continue;
- for (j = 0; j < object->size + 1; j++) {
+ for (j = 0;
+ j < (object->size + 1) * (object->instances + 1);
+ j++) {
config_offset = index + j;
if (config_offset > pdata->config_length) {
dev_err(dev, "Not enough config data!\n");
@@ -664,7 +666,7 @@ static int mxt_check_reg_init(struct mxt_data *data)
mxt_write_object(data, object->type, j,
pdata->config[config_offset]);
}
- index += object->size + 1;
+ index += (object->size + 1) * (object->instances + 1);
}
return 0;