Skip to content

Commit

Permalink
Input: atmel_mxt_ts - handle objects with multiple instances correctly
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Iiro Valkonen authored and Dmitry Torokhov committed Jul 4, 2011
1 parent 81c88a7 commit a93d4f2
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/input/touchscreen/atmel_mxt_ts.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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;
Expand Down

0 comments on commit a93d4f2

Please sign in to comment.