---

yaml --- r: 180886 b: refs/heads/master c: b490e37 h: refs/heads/master v: v3
git-mirror · Jan 20, 2010 · 96beb2a · 96beb2a
1 parent 57e41d0
commit 96beb2a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa0fcde66ac3360678360104b24492015e7b852b
+refs/heads/master: b490e3704ccee12deb295f96029d68e0daf02feb
diff --git a/trunk/drivers/spi/dw_spi.c b/trunk/drivers/spi/dw_spi.c
@@ -161,7 +161,7 @@ static inline void mrst_spi_debugfs_remove(struct dw_spi *dws)
 
 static void wait_till_not_busy(struct dw_spi *dws)
 {
-	unsigned long end = jiffies + usecs_to_jiffies(1000);
+	unsigned long end = jiffies + 1 + usecs_to_jiffies(1000);
 
 	while (time_before(jiffies, end)) {
 		if (!(dw_readw(dws, sr) & SR_BUSY))