diff options
| author |   Wolfram Sang <wsa+renesas@sang-engineering.com> | 2024-03-30 15:37:54 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2024-03-30 15:37:54 +0100 |
| commit | 2953eb02875b42c96e5ecb2d1061d0a2c1f9972b (patch) | |
| tree | c4e2e8b36ad6d04876ceb42ba9b552ab3c5b6435 | |
| parent | Linux 6.9-rc1 (diff) | |
| parent | i2c: i801: Fix a refactoring that broke a touchpad on Lenovo P1 (diff) | |
| download | wireguard-linux-2953eb02875b42c96e5ecb2d1061d0a2c1f9972b.tar.xz wireguard-linux-2953eb02875b42c96e5ecb2d1061d0a2c1f9972b.zip | |
Merge tag 'i2c-host-fixes-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current
One fix in the i801 driver where a bug caused touchpad
malfunctions on some Lenovo P1 models by incorrectly overwriting
a status variable during successful SMBUS transactions.
Diffstat (limited to '')
| -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++) |