Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a93d4f2d authored by Iiro Valkonen's avatar Iiro Valkonen Committed by Dmitry Torokhov
Browse files

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: default avatarIiro Valkonen <iiro.valkonen@atmel.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 81c88a71

drivers/input/touchscreen/atmel_mxt_ts.c

+4 −2
Original line number Diff line number Diff line
@@ -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;