diff options
author | Mathieu J. Poirier <mathieu.poirier@canonical.com> | 2010-08-17 11:16:41 -0400 |
---|---|---|
committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:46:53 -0600 |
commit | bed01c6c3b611e09914bb03ec714387c72d5d542 (patch) | |
tree | b90e3f9f6daede17173be814723c48fdfb519146 /drivers | |
parent | bf7b0a53c868a3dd581fd864e5ee5fe974409bbe (diff) |
UBUNTU: SAUCE: (no-up) ARM: Resetting power_mode to its original value.
This reverts the second part of patch:
commit 6da20c89af64b75302399369a90b9d50c1a87665
Author: Adrian Hunter <adrian.hunter@nokia.com>
Date: Mon Feb 15 10:03:34 2010 -0800
omap_hsmmc: Ensure regulator enable / disable are paired
Without this the kernel fails to initialize the SDHC card and find the
root partition. Work is currently underway with the community to find a
real solution to the problem. This a temporary measure to unblock
developers and will have to be reverted when the real fix gets upstream.
BugLink: https://bugs.launchpad.net/bugs/591941
Signed-off-by: Mathieu Poirier <mathieu.poirier@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index dedf3dab8a3..922c77196d6 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -2076,7 +2076,7 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) host->slot_id = 0; host->mapbase = res->start; host->base = ioremap(host->mapbase, SZ_4K); - host->power_mode = MMC_POWER_OFF; + host->power_mode = -1; platform_set_drvdata(pdev, host); INIT_WORK(&host->mmc_carddetect_work, omap_hsmmc_detect); |