Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 173855
b: refs/heads/master
c: 21a89d4
h: refs/heads/master
i:
  173853: 89f5a20
  173851: 540c72a
  173847: bc9a45e
  173839: 45a27ba
  173823: 1b9ddb2
v: v3
  • Loading branch information
Shinya Kuribayashi authored and Ben Dooks committed Dec 9, 2009
1 parent df4d69c commit fd0b4c8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4cb6d1d6da471d795320cc4a933ce60f415dd1f6
refs/heads/master: 21a89d4101ce338c2872401c82b66a7c155e24ab
7 changes: 4 additions & 3 deletions trunk/drivers/i2c/busses/i2c-designware.c
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev)
u32 addr = msgs[dev->msg_write_idx].addr;
u32 buf_len = dev->tx_buf_len;

intr_mask = DW_IC_INTR_STOP_DET | DW_IC_INTR_TX_ABRT;
intr_mask = DW_IC_INTR_STOP_DET | DW_IC_INTR_TX_ABRT | DW_IC_INTR_RX_FULL;

if (!(dev->status & STATUS_WRITE_IN_PROGRESS)) {
/* Disable the adapter */
Expand Down Expand Up @@ -593,10 +593,11 @@ static irqreturn_t i2c_dw_isr(int this_irq, void *dev_id)
dev->status = STATUS_IDLE;
}

if (stat & DW_IC_INTR_TX_EMPTY) {
if (stat & DW_IC_INTR_RX_FULL)
i2c_dw_read(dev);

if (stat & DW_IC_INTR_TX_EMPTY)
i2c_dw_xfer_msg(dev);
}

/*
* No need to modify or disable the interrupt mask here.
Expand Down

0 comments on commit fd0b4c8

Please sign in to comment.