Commit 3e29d6bb authored by Andrew Duggan's avatar Andrew Duggan Committed by Dmitry Torokhov

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: default avatarAndrew Duggan <aduggan@synaptics.com>
Tested-by: default avatarNitin Chaudhary <nitinchaudhary1289@gmail.com>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent fae16989
...@@ -553,7 +553,6 @@ int rmi_read_register_desc(struct rmi_device *d, u16 addr, ...@@ -553,7 +553,6 @@ int rmi_read_register_desc(struct rmi_device *d, u16 addr,
goto free_struct_buff; goto free_struct_buff;
reg = find_first_bit(rdesc->presense_map, RMI_REG_DESC_PRESENSE_BITS); reg = find_first_bit(rdesc->presense_map, RMI_REG_DESC_PRESENSE_BITS);
map_offset = 0;
for (i = 0; i < rdesc->num_registers; i++) { for (i = 0; i < rdesc->num_registers; i++) {
struct rmi_register_desc_item *item = &rdesc->registers[i]; struct rmi_register_desc_item *item = &rdesc->registers[i];
int reg_size = struct_buf[offset]; int reg_size = struct_buf[offset];
...@@ -576,6 +575,8 @@ int rmi_read_register_desc(struct rmi_device *d, u16 addr, ...@@ -576,6 +575,8 @@ int rmi_read_register_desc(struct rmi_device *d, u16 addr,
item->reg = reg; item->reg = reg;
item->reg_size = reg_size; item->reg_size = reg_size;
map_offset = 0;
do { do {
for (b = 0; b < 7; b++) { for (b = 0; b < 7; b++) {
if (struct_buf[offset] & (0x1 << b)) if (struct_buf[offset] & (0x1 << b))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment