aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorSonic Zhang <sonic.zhang@analog.com>2010-03-22 03:23:20 -0400
committerBen Dooks <ben-linux@fluff.org>2010-05-19 19:18:58 -0400
commitf0ac131a21ed13e8baaa9df6f0420f2c4b45e807 (patch)
treed346a5d0c38c9886d9803e7cf2760d76933fb053 /drivers/i2c
parentbe2f80f0a3a333c0c00b2c8a7c2d74fcd66b75a2 (diff)
i2c-bfin-twi: return completion in interrupt for smbus quick transfers
A smbus quick transfer has no data after the address byte. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-bfin-twi.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
index dabfa80cf5f2..fb26e5c67515 100644
--- a/drivers/i2c/busses/i2c-bfin-twi.c
+++ b/drivers/i2c/busses/i2c-bfin-twi.c
@@ -159,18 +159,14 @@ static void bfin_twi_handle_interrupt(struct bfin_twi_iface *iface,
159 if (mast_stat & BUFWRERR) 159 if (mast_stat & BUFWRERR)
160 dev_dbg(&iface->adap.dev, "Buffer Write Error\n"); 160 dev_dbg(&iface->adap.dev, "Buffer Write Error\n");
161 161
162 /* if both err and complete int stats are set, return proper 162 /* If it is a quick transfer, only address without data,
163 * results. 163 * not an err, return 1.
164 */ 164 */
165 if (twi_int_status & MCOMP) { 165 if (iface->cur_mode == TWI_I2C_MODE_STANDARD &&
166 /* If it is a quick transfer, only address without data, 166 iface->transPtr == NULL &&
167 * not an err, return 1. 167 (twi_int_status & MCOMP) && (mast_stat & DNAK))
168 * If address is acknowledged return 1. 168 iface->result = 1;
169 */ 169
170 if ((iface->writeNum == 0 && (mast_stat & BUFRDERR))
171 || !(mast_stat & ANAK))
172 iface->result = 1;
173 }
174 complete(&iface->complete); 170 complete(&iface->complete);
175 return; 171 return;
176 } 172 }