diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-27 09:22:08 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-27 09:22:08 +0200 |
| commit | bdac4d8abbfc239886103f7c6ee03abb8011a008 (patch) | |
| tree | fda39ff9008b28d574ccd647f41a243183663127 /drivers/i2c | |
| parent | e7deeb9d79d8691f1e6c4c6707471ec3d7b9886b (diff) | |
| parent | ff1176468d368232b684f75e82563369208bc371 (diff) | |
| download | linux-bdac4d8abbfc239886103f7c6ee03abb8011a008.tar.bz2 | |
Merge 5.14-rc3 into driver-core-next
We need the driver-core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-mpc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index 6d5014ebaab5..a6ea1eb1394e 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c @@ -635,8 +635,8 @@ static irqreturn_t mpc_i2c_isr(int irq, void *dev_id) status = readb(i2c->base + MPC_I2C_SR); if (status & CSR_MIF) { - /* Read again to allow register to stabilise */ - status = readb(i2c->base + MPC_I2C_SR); + /* Wait up to 100us for transfer to properly complete */ + readb_poll_timeout(i2c->base + MPC_I2C_SR, status, !(status & CSR_MCF), 0, 100); writeb(0, i2c->base + MPC_I2C_SR); mpc_i2c_do_intr(i2c, status); return IRQ_HANDLED; |