From 6afd85ded7bd1ae07010bc4c29d928607348948d Mon Sep 17 00:00:00 2001 From: Adrian Hunter Date: Mon, 15 Feb 2010 10:03:34 -0800 Subject: [PATCH] --- yaml --- r: 184715 b: refs/heads/master c: 4380eea266940a82e5b8edd5c16ce0289679bcfe h: refs/heads/master i: 184713: 08f8b30420cb6d6dc48291bdb221e7058b3f26dd 184711: 80b4d79781cf940d04bac50d2460193c1c1893c7 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/omap_hsmmc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 98b9cdb08ce7..86b5b92fa172 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1df58db8a25ec7656005f1dd161a9ede044551b7 +refs/heads/master: 4380eea266940a82e5b8edd5c16ce0289679bcfe diff --git a/trunk/drivers/mmc/host/omap_hsmmc.c b/trunk/drivers/mmc/host/omap_hsmmc.c index e15d0f42569d..cb94044f3fc4 100644 --- a/trunk/drivers/mmc/host/omap_hsmmc.c +++ b/trunk/drivers/mmc/host/omap_hsmmc.c @@ -1620,7 +1620,7 @@ static int omap_hsmmc_enabled_to_disabled(struct omap_hsmmc_host *host) if (host->power_mode == MMC_POWER_OFF) return 0; - return msecs_to_jiffies(OMAP_MMC_SLEEP_TIMEOUT); + return OMAP_MMC_SLEEP_TIMEOUT; } /* Handler for [DISABLED -> REGSLEEP / CARDSLEEP] transition */ @@ -1663,7 +1663,7 @@ static int omap_hsmmc_disabled_to_sleep(struct omap_hsmmc_host *host) mmc_slot(host).card_detect || (mmc_slot(host).get_cover_state && mmc_slot(host).get_cover_state(host->dev, host->slot_id))) - return msecs_to_jiffies(OMAP_MMC_OFF_TIMEOUT); + return OMAP_MMC_OFF_TIMEOUT; return 0; }