diff options
| author | Andrew Duggan <aduggan@synaptics.com> | 2016-08-22 21:28:11 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-07 09:34:53 +0300 |
| commit | 95162d7fa0ec9e213bd8d97a18b2e2cdcb3f6537 (patch) | |
| tree | da32f904661a87c6e65779972ff2d2ec7b7d2d6d | |
| parent | bb2afc2c5a12f5f78aab9b016b6d0cb433c74094 (diff) | |
| download | linux-95162d7fa0ec9e213bd8d97a18b2e2cdcb3f6537.tar.xz | |
Input: synaptics-rmi4 - fix register descriptor subpacket map construction
commit 3e29d6bb6433ebfa4e187b1164b80baf720d58c3 upstream.
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>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/input/rmi4/rmi_driver.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c index faa295ec4f31..c83bce89028b 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -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)) |