---

yaml
---
r: 36095
b: refs/heads/master
c: 8859942
h: refs/heads/master
i:
  36093: fc7c2fe
  36091: f268e4d
  36087: 791e568
  36079: 8d3a41e
  36063: 0fd5b56
  36031: f412790
  35967: 235b6c1
  35839: cc4705e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 643bd3fbd9dc73ed3dc1e4f6980e6f15fdbb9bb6
+refs/heads/master: 8859942ede8154c1e90e3b0d1b60aecf0cfaa169

trunk/drivers/i2c/busses/i2c-au1550.c

@@ -118,13 +118,19 @@ do_address(struct i2c_au1550_data *adap, unsigned int addr, int rd)
 
 	/* Reset the FIFOs, clear events.
 	*/
-	sp->psc_smbpcr = PSC_SMBPCR_DC;
+	stat = sp->psc_smbstat;
 	sp->psc_smbevnt = PSC_SMBEVNT_ALLCLR;
 	au_sync();
-	do {
-		stat = sp->psc_smbpcr;
+
+	if (!(stat & PSC_SMBSTAT_TE) || !(stat & PSC_SMBSTAT_RE)) {
+		sp->psc_smbpcr = PSC_SMBPCR_DC;
 		au_sync();
-	} while ((stat & PSC_SMBPCR_DC) != 0);
+		do {
+			stat = sp->psc_smbpcr;
+			au_sync();
+		} while ((stat & PSC_SMBPCR_DC) != 0);
+		udelay(50);
+	}
 
 	/* Write out the i2c chip address and specify operation
 	*/