aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/i2c/busses/i2c-omap.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 0dd647abb89d..30ea63c24b5d 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -786,6 +786,7 @@ complete:
786 dev_err(dev->dev, "Arbitration lost\n"); 786 dev_err(dev->dev, "Arbitration lost\n");
787 err |= OMAP_I2C_STAT_AL; 787 err |= OMAP_I2C_STAT_AL;
788 } 788 }
789
789 /* 790 /*
790 * ProDB0017052: Clear ARDY bit twice 791 * ProDB0017052: Clear ARDY bit twice
791 */ 792 */
@@ -798,6 +799,7 @@ complete:
798 omap_i2c_complete_cmd(dev, err); 799 omap_i2c_complete_cmd(dev, err);
799 return IRQ_HANDLED; 800 return IRQ_HANDLED;
800 } 801 }
802
801 if (stat & (OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR)) { 803 if (stat & (OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR)) {
802 u8 num_bytes = 1; 804 u8 num_bytes = 1;
803 805
@@ -844,6 +846,7 @@ complete:
844 stat & (OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR)); 846 stat & (OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR));
845 continue; 847 continue;
846 } 848 }
849
847 if (stat & (OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR)) { 850 if (stat & (OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR)) {
848 u8 num_bytes = 1; 851 u8 num_bytes = 1;
849 if (dev->fifo_size) { 852 if (dev->fifo_size) {
@@ -891,10 +894,12 @@ complete:
891 stat & (OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR)); 894 stat & (OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR));
892 continue; 895 continue;
893 } 896 }
897
894 if (stat & OMAP_I2C_STAT_ROVR) { 898 if (stat & OMAP_I2C_STAT_ROVR) {
895 dev_err(dev->dev, "Receive overrun\n"); 899 dev_err(dev->dev, "Receive overrun\n");
896 dev->cmd_err |= OMAP_I2C_STAT_ROVR; 900 dev->cmd_err |= OMAP_I2C_STAT_ROVR;
897 } 901 }
902
898 if (stat & OMAP_I2C_STAT_XUDF) { 903 if (stat & OMAP_I2C_STAT_XUDF) {
899 dev_err(dev->dev, "Transmit underflow\n"); 904 dev_err(dev->dev, "Transmit underflow\n");
900 dev->cmd_err |= OMAP_I2C_STAT_XUDF; 905 dev->cmd_err |= OMAP_I2C_STAT_XUDF;