Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4380eea2 authored by Adrian Hunter's avatar Adrian Hunter Committed by Tony Lindgren
Browse files

omap_hsmmc: Fix disable timeouts 



Disable timeouts are in msecs not jiffies.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 1df58db8

drivers/mmc/host/omap_hsmmc.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1620,7 +1620,7 @@ static int omap_hsmmc_enabled_to_disabled(struct omap_hsmmc_host *host) 
	if (host->power_mode == MMC_POWER_OFF)

	if (host->power_mode == MMC_POWER_OFF)

		return 0;

		return 0;





	return msecs_to_jiffies(OMAP_MMC_SLEEP_TIMEOUT);

	return OMAP_MMC_SLEEP_TIMEOUT;

}

}





/* Handler for [DISABLED -> REGSLEEP / CARDSLEEP] transition */

/* 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).card_detect ||

	    (mmc_slot(host).get_cover_state &&

	    (mmc_slot(host).get_cover_state &&

	     mmc_slot(host).get_cover_state(host->dev, host->slot_id)))

	     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;

	return 0;

}

}