---

yaml --- r: 77559 b: refs/heads/master c: 732ce16 h: refs/heads/master i: 77557: 4323a37 77555: e48b87b 77551: 8a88a15 v: v3
git-mirror · Jan 26, 2008 · d9477c6 · d9477c6
1 parent a3e2c5e
commit d9477c6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a1f21b1e546fafe840944f02949c1a8a8725132
+refs/heads/master: 732ce16066964bb7b60947750e48374cc32bd310
diff --git a/trunk/arch/arm/mach-pxa/ssp.c b/trunk/arch/arm/mach-pxa/ssp.c
@@ -138,6 +138,16 @@ int ssp_flush(struct ssp_dev *dev)
 	struct ssp_device *ssp = dev->ssp;
 	int timeout = TIMEOUT * 2;
 
+	/* ensure TX FIFO is empty instead of not full */
+	if (cpu_is_pxa3xx()) {
+		while (__raw_readl(ssp->mmio_base + SSSR) & 0xf00) {
+			if (!--timeout)
+				return -ETIMEDOUT;
+			cpu_relax();
+		}
+		timeout = TIMEOUT * 2;
+	}
+
 	do {
 		while (__raw_readl(ssp->mmio_base + SSSR) & SSSR_RNE) {
 		        if (!--timeout)