diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-06 12:16:38 +0100 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-06 12:16:38 +0100 |
| commit | 7221077a5ba462dd1dd1aadf9ec7a48185968217 (patch) | |
| tree | d64cb4ddd71e6daa4fa946365d3f7dc3f65fd331 | |
| parent | 1120425e03c4fa7b0397b9b1b8e24e17a4971da2 (diff) | |
| parent | 78762aa702a09906a562cfb780a861eb0f8d92d9 (diff) | |
Merge branch 'om-gta02-2.6.31' into om-2.6.31
| -rw-r--r-- | drivers/mfd/glamo/glamo-mci.c | 5 |
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; } |