History

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

Linus Torvalds committed 2 years ago

Commit ac672712 parents ff789a2 2953eb01 file · +4 −3Browse files

Unified · Split

drivers/i2c/busses/i2c-i801.c+4−3
@@ -536,11 +536,12 @@ static int i801_block_transaction_by_block(struct i801_priv *priv, · 535 unmodified lines
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++)