summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Andrews <tandrews@grok.co.za>2006-07-01 17:05:12 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2006-07-12 15:43:06 -0700
commitfd627a01477dadaef3bc8556e5e9d0ef80310c3a (patch)
tree36e25979b44ad7de31e412d2b1a8fe77fca0d3ea
parent39288e1ac10b3b9a68a629be67d81a0b53512c4e (diff)
downloadblackbird-op-linux-fd627a01477dadaef3bc8556e5e9d0ef80310c3a.tar.gz
blackbird-op-linux-fd627a01477dadaef3bc8556e5e9d0ef80310c3a.zip
[PATCH] scx200_acb: Fix the state machine
Fix the scx200_acb state machine: * Nack was sent one byte too late on reads >= 2 bytes. * Stop bit was set one byte too late on reads. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/i2c/busses/scx200_acb.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index 22a3eda04166..454086affaa1 100644
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -184,21 +184,21 @@ static void scx200_acb_machine(struct scx200_acb_iface *iface, u8 status)
break;
case state_read:
- /* Set ACK if receiving the last byte */
- if (iface->len == 1)
+ /* Set ACK if _next_ byte will be the last one */
+ if (iface->len == 2)
outb(inb(ACBCTL1) | ACBCTL1_ACK, ACBCTL1);
else
outb(inb(ACBCTL1) & ~ACBCTL1_ACK, ACBCTL1);
- *iface->ptr++ = inb(ACBSDA);
- --iface->len;
-
- if (iface->len == 0) {
+ if (iface->len == 1) {
iface->result = 0;
iface->state = state_idle;
outb(inb(ACBCTL1) | ACBCTL1_STOP, ACBCTL1);
}
+ *iface->ptr++ = inb(ACBSDA);
+ --iface->len;
+
break;
case state_write:
OpenPOWER on IntegriCloud