aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@nokia.com>2010-02-15 13:03:34 -0500
committerTony Lindgren <tony@atomide.com>2010-02-15 13:03:34 -0500
commit4380eea266940a82e5b8edd5c16ce0289679bcfe (patch)
tree94bd6f0fb80c3835b478891f817c726d02d6c759
parent1df58db8a25ec7656005f1dd161a9ede044551b7 (diff)
omap_hsmmc: Fix disable timeouts
Disable timeouts are in msecs not jiffies. Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--drivers/mmc/host/omap_hsmmc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index e15d0f42569d..cb94044f3fc4 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1620,7 +1620,7 @@ static int omap_hsmmc_enabled_to_disabled(struct omap_hsmmc_host *host)
1620 if (host->power_mode == MMC_POWER_OFF) 1620 if (host->power_mode == MMC_POWER_OFF)
1621 return 0; 1621 return 0;
1622 1622
1623 return msecs_to_jiffies(OMAP_MMC_SLEEP_TIMEOUT); 1623 return OMAP_MMC_SLEEP_TIMEOUT;
1624} 1624}
1625 1625
1626/* Handler for [DISABLED -> REGSLEEP / CARDSLEEP] transition */ 1626/* Handler for [DISABLED -> REGSLEEP / CARDSLEEP] transition */
@@ -1663,7 +1663,7 @@ static int omap_hsmmc_disabled_to_sleep(struct omap_hsmmc_host *host)
1663 mmc_slot(host).card_detect || 1663 mmc_slot(host).card_detect ||
1664 (mmc_slot(host).get_cover_state && 1664 (mmc_slot(host).get_cover_state &&
1665 mmc_slot(host).get_cover_state(host->dev, host->slot_id))) 1665 mmc_slot(host).get_cover_state(host->dev, host->slot_id)))
1666 return msecs_to_jiffies(OMAP_MMC_OFF_TIMEOUT); 1666 return OMAP_MMC_OFF_TIMEOUT;
1667 1667
1668 return 0; 1668 return 0;
1669} 1669}