Title: [9105] trunk/drivers/i2c/busses/i2c-bfin-twi.c: Bug[#6136] stop receive operation immediately in last byte rx interrupt.
- Revision
- 9105
- Author
- sonicz
- Date
- 2010-08-26 01:13:29 -0400 (Thu, 26 Aug 2010)
Log Message
Bug[#6136] stop receive operation immediately in last byte rx interrupt.
Also wake up waiting process only when transfer completes.
Modified Paths
Diff
Modified: trunk/drivers/i2c/busses/i2c-bfin-twi.c (9104 => 9105)
--- trunk/drivers/i2c/busses/i2c-bfin-twi.c 2010-08-25 22:00:31 UTC (rev 9104)
+++ trunk/drivers/i2c/busses/i2c-bfin-twi.c 2010-08-26 05:13:29 UTC (rev 9105)
@@ -130,21 +130,25 @@
}
iface->transPtr++;
iface->readNum--;
- } else if (iface->manual_stop) {
- /* Avoid possible bus stall -
- * Flush FIFO before issuing the STOP condition
- */
- read_RCV_DATA16(iface);
- write_MASTER_CTL(iface,
- read_MASTER_CTL(iface) | STOP);
- } else if (iface->cur_mode == TWI_I2C_MODE_REPEAT &&
- iface->cur_msg + 1 < iface->msg_num) {
- if (iface->pmsg[iface->cur_msg + 1].flags & I2C_M_RD)
+ }
+
+ if (iface->readNum == 0) {
+ if (iface->manual_stop) {
+ /* Avoid possible bus stall -
+ * Flush FIFO before issuing the STOP condition
+ */
+ read_RCV_DATA16(iface);
write_MASTER_CTL(iface,
- read_MASTER_CTL(iface) | RSTART | MDIR);
- else
- write_MASTER_CTL(iface,
- (read_MASTER_CTL(iface) | RSTART) & ~MDIR);
+ read_MASTER_CTL(iface) | STOP);
+ } else if (iface->cur_mode == TWI_I2C_MODE_REPEAT &&
+ iface->cur_msg + 1 < iface->msg_num) {
+ if (iface->pmsg[iface->cur_msg + 1].flags & I2C_M_RD)
+ write_MASTER_CTL(iface,
+ read_MASTER_CTL(iface) | RSTART | MDIR);
+ else
+ write_MASTER_CTL(iface,
+ (read_MASTER_CTL(iface) | RSTART) & ~MDIR);
+ }
}
}
if (twi_int_status & MERR) {
@@ -239,12 +243,13 @@
}
}
- if (iface->pmsg[iface->cur_msg].len <= 255)
- write_MASTER_CTL(iface,
+ if (iface->pmsg[iface->cur_msg].len <= 255) {
+ write_MASTER_CTL(iface,
(read_MASTER_CTL(iface) &
(~(0xff << 6))) |
- (iface->pmsg[iface->cur_msg].len << 6));
- else {
+ (iface->pmsg[iface->cur_msg].len << 6));
+ iface->manual_stop = 0;
+ } else {
write_MASTER_CTL(iface,
(read_MASTER_CTL(iface) |
(0xff << 6)));
@@ -258,8 +263,8 @@
write_INT_MASK(iface, 0);
write_MASTER_CTL(iface, 0);
}
+ complete(&iface->complete);
}
- complete(&iface->complete);
}
/* Interrupt handler */
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
