lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] scx200_acb: Fix the state machine

Browse Source 
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>
This commit is contained in:
Thomas Andrews
2006-07-01 17:05:12 +02:00
committed by Greg Kroah-Hartman
parent 39288e1ac1
commit fd627a0147
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/i2c/busses/scx200_acb.c
View File

@@ -184,21 +184,21 @@ static void scx200_acb_machine(struct scx200_acb_iface *iface, u8 status)
break; break;
case state_read: case state_read:
/* Set ACK if receiving the last byte */ /* Set ACK if _next_ byte will be the last one */
if (iface->len == 1) if (iface->len == 2)
outb(inb(ACBCTL1) | ACBCTL1_ACK, ACBCTL1); outb(inb(ACBCTL1) | ACBCTL1_ACK, ACBCTL1);
else else
outb(inb(ACBCTL1) & ~ACBCTL1_ACK, ACBCTL1); outb(inb(ACBCTL1) & ~ACBCTL1_ACK, ACBCTL1);
*iface->ptr++ = inb(ACBSDA); if (iface->len == 1) {
--iface->len;
if (iface->len == 0) {
iface->result = 0; iface->result = 0;
iface->state = state_idle; iface->state = state_idle;
outb(inb(ACBCTL1) | ACBCTL1_STOP, ACBCTL1); outb(inb(ACBCTL1) | ACBCTL1_STOP, ACBCTL1);
} }
*iface->ptr++ = inb(ACBSDA);
--iface->len;
break; break;
case state_write: case state_write: