aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNelson Castillo <arhuaco@freaks-unidos.net>2009-11-05 23:01:46 -0500
committerLars-Peter Clausen <lars@metafoo.de>2009-12-06 08:46:45 +0100
commit1d482c4ef16308d77ff4415714ec7b7bc3c2ecb1 (patch)
tree1bd900a772a6853b54651da2e9bac468b9c561af
parent74bf773e264fd984549e9affb35b753efaa85854 (diff)
Fix jiffies comparison
Jiffies can wrap. We have to use macros to compare them. Signed-off-by: Nelson Castillo <arhuaco@freaks-unidos.net>
-rw-r--r--drivers/mfd/glamo/glamo-mci.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
index 34bdbebb9db..faeb885c553 100644
--- a/drivers/mfd/glamo/glamo-mci.c
+++ b/drivers/mfd/glamo/glamo-mci.c
@@ -238,9 +238,10 @@ static int glamo_mci_wait_idle(struct glamo_mci_host *host,
uint16_t status;
do {
status = glamo_reg_read(host, GLAMO_REG_MMC_RB_STAT1);
- } while (!(status & GLAMO_STAT1_MMC_IDLE) && jiffies < timeout);
+ } while (!(status & GLAMO_STAT1_MMC_IDLE) &&
+ time_is_after_jiffies(timeout));
- if (jiffies >= timeout) {
+ if (time_is_before_eq_jiffies(timeout)) {
glamo_mci_reset(host);
return -ETIMEDOUT;
}