---

yaml --- r: 365220 b: refs/heads/master c: ff23fa3 h: refs/heads/master v: v3
git-mirror · Apr 1, 2013 · e55e3e7 · e55e3e7
1 parent 1e42103
commit e55e3e7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e761f4236e94f2dd36316f9892583b29ce986031
+refs/heads/master: ff23fa3bb05b296eeab2ccde92c0cdbc05942a1c
diff --git a/trunk/drivers/spi/spi-omap2-mcspi.c b/trunk/drivers/spi/spi-omap2-mcspi.c
@@ -285,8 +285,12 @@ static int mcspi_wait_for_reg_bit(void __iomem *reg, unsigned long bit)
 
 	timeout = jiffies + msecs_to_jiffies(1000);
 	while (!(__raw_readl(reg) & bit)) {
-		if (time_after(jiffies, timeout))
-			return -1;
+		if (time_after(jiffies, timeout)) {
+			if (!(__raw_readl(reg) & bit))
+				return -ETIMEDOUT;
+			else
+				return 0;
+		}
 		cpu_relax();
 	}
 	return 0;