1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 893c3d78e426..61eef47ae821 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/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;