Commit e98f34af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e7aa5724 b126097b

drivers/i2c/busses/i2c-imx.c

+2 −1
Original line number Diff line number Diff line
@@ -1103,6 +1103,7 @@ static irqreturn_t i2c_imx_master_isr(struct imx_i2c_struct *i2c_imx, unsigned i 


	case IMX_I2C_STATE_READ_BLOCK_DATA_LEN:

		i2c_imx_isr_read_block_data_len(i2c_imx);

		if (i2c_imx->state == IMX_I2C_STATE_READ_BLOCK_DATA_LEN)

			i2c_imx->state = IMX_I2C_STATE_READ_CONTINUE;

		break;