i2c_imx_clear_ir did not join in the merge conflict, so use i2c_imx_clr_al_bit function instead
Signed-off-by: Xiaolei Wang <[email protected]> --- drivers/i2c/busses/i2c-imx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 16b741251055..8a215a5ccb38 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -550,6 +550,7 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy) static int i2c_imx_trx_complete(struct imx_i2c_struct *i2c_imx) { + unsigned int temp; wait_event_timeout(i2c_imx->queue, i2c_imx->i2csr & I2SR_IIF, HZ / 10); if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) { @@ -560,7 +561,8 @@ static int i2c_imx_trx_complete(struct imx_i2c_struct *i2c_imx) /* check for arbitration lost */ if (i2c_imx->i2csr & I2SR_IAL) { dev_dbg(&i2c_imx->adapter.dev, "<%s> Arbitration lost\n", __func__); - i2c_imx_clear_irq(i2c_imx, I2SR_IAL); + temp = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2SR); + i2c_imx_clr_al_bit(temp, i2c_imx); i2c_imx->i2csr = 0; return -EAGAIN; -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9280): https://lists.yoctoproject.org/g/linux-yocto/message/9280 Mute This Topic: https://lists.yoctoproject.org/mt/79053384/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
