Commit ac672718 authored by Linus Torvalds's avatar Linus Torvalds

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
parents ff789a26 2953eb02
...@@ -536,11 +536,12 @@ static int i801_block_transaction_by_block(struct i801_priv *priv, ...@@ -536,11 +536,12 @@ static int i801_block_transaction_by_block(struct i801_priv *priv,
if (read_write == I2C_SMBUS_READ || if (read_write == I2C_SMBUS_READ ||
command == I2C_SMBUS_BLOCK_PROC_CALL) { command == I2C_SMBUS_BLOCK_PROC_CALL) {
status = i801_get_block_len(priv); len = i801_get_block_len(priv);
if (status < 0) if (len < 0) {
status = len;
goto out; goto out;
}
len = status;
data->block[0] = len; data->block[0] = len;
inb_p(SMBHSTCNT(priv)); /* reset the data buffer index */ inb_p(SMBHSTCNT(priv)); /* reset the data buffer index */
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
......
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