diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-06 12:14:15 +0100 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-06 12:14:15 +0100 |
| commit | 78762aa702a09906a562cfb780a861eb0f8d92d9 (patch) | |
| tree | e57f4a3d2d328bece29a2a121420807074576894 | |
| parent | ccadba9e8c8c45d861df1191c580f7d0abbdd218 (diff) | |
| parent | 5632f33dc20fec54f329299720dab47fb20cc3e6 (diff) | |
Merge branch 'glamo-2.6.31' into om-gta02-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; } |