diff options
| author | Linaro CI <ci_notify@linaro.org> | 2020-12-02 06:11:41 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2020-12-02 06:11:41 +0000 |
| commit | 44ca761622e9f29e8bd27f827964f860adcac63a (patch) | |
| tree | afef4846fc8544dd1b4df1b89bbb3bb77bb22c43 | |
| parent | 0f007cc599323ae1c04ec5febb100a292edc60b8 (diff) | |
| parent | eccf0e49b2b2f795ff77b45ffb8b8013b9f4c105 (diff) | |
Merge remote-tracking branch 'qcom-cci-irq-error/tracking-qcomlt-cci-irq-error' into integration-linux-qcomlt
| -rw-r--r-- | drivers/i2c/busses/i2c-qcom-cci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-qcom-cci.c b/drivers/i2c/busses/i2c-qcom-cci.c index f13735beca58..1c259b5188de 100644 --- a/drivers/i2c/busses/i2c-qcom-cci.c +++ b/drivers/i2c/busses/i2c-qcom-cci.c @@ -194,9 +194,9 @@ static irqreturn_t cci_isr(int irq, void *dev) if (unlikely(val & CCI_IRQ_STATUS_0_I2C_M1_ERROR)) { if (val & CCI_IRQ_STATUS_0_I2C_M1_Q0_NACK_ERR || val & CCI_IRQ_STATUS_0_I2C_M1_Q1_NACK_ERR) - cci->master[0].status = -ENXIO; + cci->master[1].status = -ENXIO; else - cci->master[0].status = -EIO; + cci->master[1].status = -EIO; writel(CCI_HALT_REQ_I2C_M1_Q0Q1, cci->base + CCI_HALT_REQ); ret = IRQ_HANDLED; |