Merge commit 'origin/master' into next

[profile/ivi/kernel-adaptation-intel-automotive.git] / drivers / spi / spi_stmp.c

diff --git a/drivers/spi/spi_stmp.c b/drivers/spi/spi_stmp.c
index 2552bb3..fadff76 100644 (file)
--- a/drivers/spi/spi_stmp.c
+++ b/drivers/spi/spi_stmp.c
@@ -76,7 +76,7 @@ struct stmp_spi {
                        break;                                          \
                }                                                       \
                cpu_relax();                                            \
-       } while (time_before(end_jiffies, jiffies));                    \
+       } while (time_before(jiffies, end_jiffies));                    \
        succeeded;                                                      \
        })