Commit 8ff771f8 authored by Hans Verkuil's avatar Hans Verkuil Committed by Dmitry Torokhov

Revert "Input: synaptics-rmi4 - don't increment rmiaddr for SMBus transfers"

This reverts commit a284e11c.

This causes problems (drifting cursor) with at least the F11 function that
reads more than 32 bytes.

The real issue is in the F54 driver, and so this should be fixed there, and
not in rmi_smbus.c.

So first revert this bad commit, then fix the real problem in F54 in another
patch.
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Reported-by: default avatarTimo Kaufmann <timokau@zoho.com>
Fixes: a284e11c ("Input: synaptics-rmi4 - don't increment rmiaddr for SMBus transfers")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20200115124819.3191024-2-hverkuil-cisco@xs4all.nlSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 6b32391e
...@@ -163,6 +163,7 @@ static int rmi_smb_write_block(struct rmi_transport_dev *xport, u16 rmiaddr, ...@@ -163,6 +163,7 @@ static int rmi_smb_write_block(struct rmi_transport_dev *xport, u16 rmiaddr,
/* prepare to write next block of bytes */ /* prepare to write next block of bytes */
cur_len -= SMB_MAX_COUNT; cur_len -= SMB_MAX_COUNT;
databuff += SMB_MAX_COUNT; databuff += SMB_MAX_COUNT;
rmiaddr += SMB_MAX_COUNT;
} }
exit: exit:
mutex_unlock(&rmi_smb->page_mutex); mutex_unlock(&rmi_smb->page_mutex);
...@@ -214,6 +215,7 @@ static int rmi_smb_read_block(struct rmi_transport_dev *xport, u16 rmiaddr, ...@@ -214,6 +215,7 @@ static int rmi_smb_read_block(struct rmi_transport_dev *xport, u16 rmiaddr,
/* prepare to read next block of bytes */ /* prepare to read next block of bytes */
cur_len -= SMB_MAX_COUNT; cur_len -= SMB_MAX_COUNT;
databuff += SMB_MAX_COUNT; databuff += SMB_MAX_COUNT;
rmiaddr += SMB_MAX_COUNT;
} }
retval = 0; retval = 0;
......
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