diff options
| author | Tom Rini <trini@konsulko.com> | 2023-09-22 18:25:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-09-22 18:25:37 -0400 |
| commit | 4cb31a9f3560b293670de95e76c1f3cf2f9e1ca8 (patch) | |
| tree | b32b0d1da40fb08ad70f564da42b39e9ccec9b77 /drivers/i2c/mtk_i2c.c | |
| parent | d01a8541d62d78ad76706617e9f8690c8cb01fb8 (diff) | |
| parent | ff6156f0300d3bf77e9d9091a4f1f6f9112d7278 (diff) | |
Merge branch '2023-09-22-assorted-bugfixes'
- A few driver fixes and MAINTAINER updates
Diffstat (limited to 'drivers/i2c/mtk_i2c.c')
| -rw-r--r-- | drivers/i2c/mtk_i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/mtk_i2c.c b/drivers/i2c/mtk_i2c.c index 2f331d3216a..5592fe91817 100644 --- a/drivers/i2c/mtk_i2c.c +++ b/drivers/i2c/mtk_i2c.c @@ -621,7 +621,7 @@ static int mtk_i2c_do_transfer(struct mtk_i2c_priv *priv, i2c_writel(priv, REG_INTR_MASK, ~(restart_flag | I2C_HS_NACKERR | I2C_ACKERR | I2C_TRANSAC_COMP)); - if (!tmo && trans_error != 0) { + if (tmo || trans_error != 0) { if (tmo) { ret = -ETIMEDOUT; if (!priv->filter_msg) |