summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorSonasath, Moiz <m-sonasath@ti.com>2009-07-21 10:14:40 -0500
committerBen Dooks <ben-linux@fluff.org>2009-07-30 01:03:24 +0100
commit04c688dd7a65935568b44629bfaa122eddf76e94 (patch)
tree05255936d55e6e680ba38b29255fbb6cba02655b /drivers
parentbfb6b6588af5ff762222cee79152d2be738ccc06 (diff)
downloadlinux-3.10-04c688dd7a65935568b44629bfaa122eddf76e94.tar.gz
linux-3.10-04c688dd7a65935568b44629bfaa122eddf76e94.tar.bz2
linux-3.10-04c688dd7a65935568b44629bfaa122eddf76e94.zip
i2c-omap: In case of a NACK|ARDY|AL return from the ISR
In case of a NACK or ARDY or AL interrupt, complete the request. There is no need to service the RRDY/RDR or XRDY/XDR interrupts. Refer TRM SWPU114: Figure 18-31.I2C Master Transmitter Mode, Interrupt Method, in F/S and HS Modes http://focus.ti.com/pdfs/wtbu/SWPU114T_PrelimFinalEPDF_06_25_2009.pdf Signed-off-by: Moiz Sonasath <m-sonasath@ti.com> Signed-off-by: Vikram pandita <vikram.pandita@ti.com> [ben-linux@fluff.org: fixed mail format and added i2c-omap to subject] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/busses/i2c-omap.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index a6966578851..5c508ccf438 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -685,8 +685,10 @@ omap_i2c_isr(int this_irq, void *dev_id)
err |= OMAP_I2C_STAT_AL;
}
if (stat & (OMAP_I2C_STAT_ARDY | OMAP_I2C_STAT_NACK |
- OMAP_I2C_STAT_AL))
+ OMAP_I2C_STAT_AL)) {
omap_i2c_complete_cmd(dev, err);
+ return IRQ_HANDLED;
+ }
if (stat & (OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR)) {
u8 num_bytes = 1;
if (dev->fifo_size) {