Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit ac67271

Browse files
committed
Merge tag 'i2c-for-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fix from Wolfram Sang: "A fix from Andi for I2C host drivers" * tag 'i2c-for-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: i801: Fix a refactoring that broke a touchpad on Lenovo P1
2 parents ff789a2 + 2953eb0 commit ac67271

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/i2c/busses/i2c-i801.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -536,11 +536,12 @@ static int i801_block_transaction_by_block(struct i801_priv *priv,
536536

537537
if (read_write == I2C_SMBUS_READ ||
538538
command == I2C_SMBUS_BLOCK_PROC_CALL) {
539-
status = i801_get_block_len(priv);
540-
if (status < 0)
539+
len = i801_get_block_len(priv);
540+
if (len < 0) {
541+
status = len;
541542
goto out;
543+
}
542544

543-
len = status;
544545
data->block[0] = len;
545546
inb_p(SMBHSTCNT(priv)); /* reset the data buffer index */
546547
for (i = 0; i < len; i++)

0 commit comments

Comments
 (0)