diff options
| author | Maxim Levitsky <mlevitsk@redhat.com> | 2024-03-21 10:19:19 -0400 |
|---|---|---|
| committer | Andi Shyti <andi.shyti@kernel.org> | 2024-03-26 00:47:08 +0100 |
| commit | d1ef7a9ca867ab5c161d1647b2a8ec93a2ea155d (patch) | |
| tree | c4e2e8b36ad6d04876ceb42ba9b552ab3c5b6435 /drivers/i2c | |
| parent | 4cece764965020c22cff7665b18a012006359095 (diff) | |
| download | linux-d1ef7a9ca867ab5c161d1647b2a8ec93a2ea155d.tar.gz linux-d1ef7a9ca867ab5c161d1647b2a8ec93a2ea155d.tar.bz2 linux-d1ef7a9ca867ab5c161d1647b2a8ec93a2ea155d.zip | |
i2c: i801: Fix a refactoring that broke a touchpad on Lenovo P1
Commit 857cc04cdf50 ("i2c: i801: Add helper i801_get_block_len")
introduced a slight functional change: the status variable is now
overwritten with the length of an SMBUS tranasaction,
even in case of success.
This breaks the touchpad on at least my Lenovo P1:
rmi4_physical rmi4-00: Read PDT entry at 0x00e9 failed, code: -6.
rmi4_physical rmi4-00: RMI initial reset failed! Continuing in spite of this.
rmi4_physical rmi4-00: Read PDT entry at 0x00e9 failed, code: -6.
rmi4_physical rmi4-00: IRQ counting failed with code -6.
Fixes: 857cc04cdf50 ("i2c: i801: Add helper i801_get_block_len")
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-i801.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index a6861660cb8c..79870dd7a014 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c @@ -536,11 +536,12 @@ static int i801_block_transaction_by_block(struct i801_priv *priv, if (read_write == I2C_SMBUS_READ || command == I2C_SMBUS_BLOCK_PROC_CALL) { - status = i801_get_block_len(priv); - if (status < 0) + len = i801_get_block_len(priv); + if (len < 0) { + status = len; goto out; + } - len = status; data->block[0] = len; inb_p(SMBHSTCNT(priv)); /* reset the data buffer index */ for (i = 0; i < len; i++) |