Commit 3e29d6bb authored Aug 22, 2016 by Andrew Duggan Committed by Dmitry Torokhov Aug 22, 2016

Input: synaptics-rmi4 - fix register descriptor subpacket map construction



The map_offset variable is specific to the register and needs to be reset
in the loop. Otherwise, subsequent register's subpacket maps will have
their bits set at the wrong index.

Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
Tested-by: Nitin Chaudhary <nitinchaudhary1289@gmail.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

parent fae16989

drivers/input/rmi4/rmi_driver.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -553,7 +553,6 @@ int rmi_read_register_desc(struct rmi_device *d, u16 addr,
		goto free_struct_buff;

		reg = find_first_bit(rdesc->presense_map, RMI_REG_DESC_PRESENSE_BITS);
		map_offset = 0;
		for (i = 0; i < rdesc->num_registers; i++) {
		struct rmi_register_desc_item *item = &rdesc->registers[i];
		int reg_size = struct_buf[offset];
		@@ -576,6 +575,8 @@ int rmi_read_register_desc(struct rmi_device *d, u16 addr,
		item->reg = reg;
		item->reg_size = reg_size;

		map_offset = 0;

		do {
		for (b = 0; b < 7; b++) {
		if (struct_buf[offset] & (0x1 << b))