Commit 2953eb02 authored by Wolfram Sang's avatar Wolfram Sang
Browse files

Merge tag 'i2c-host-fixes-6.9-rc2' of...

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.
parents 4cece764 d1ef7a9c
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -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++)