tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'i2c-for-6.19-final' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fix from Wolfram Sang:

- imx: preserve error state during SMBus block read length handling

* tag 'i2c-for-6.19-final' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: imx: preserve error state in block data length handler

Linus Torvalds e98f34af e7aa5724

+2 -1
unified split
+2 -1
drivers/i2c/busses/i2c-imx.c
··· 1103 1104 case IMX_I2C_STATE_READ_BLOCK_DATA_LEN: 1105 i2c_imx_isr_read_block_data_len(i2c_imx); 1106 - i2c_imx->state = IMX_I2C_STATE_READ_CONTINUE; 1107 break; 1108 1109 case IMX_I2C_STATE_WRITE:
··· 1103 1104 case IMX_I2C_STATE_READ_BLOCK_DATA_LEN: 1105 i2c_imx_isr_read_block_data_len(i2c_imx); 1106 + if (i2c_imx->state == IMX_I2C_STATE_READ_BLOCK_DATA_LEN) 1107 + i2c_imx->state = IMX_I2C_STATE_READ_CONTINUE; 1108 break; 1109 1110 case IMX_I2C_STATE_WRITE: