summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMathieu J. Poirier <mathieu.poirier@canonical.com>2010-08-17 11:16:41 -0400
committerJohn Rigby <john.rigby@linaro.org>2012-08-15 23:45:48 -0600
commitc9142a82116d99eb22e702b775f08ca8e5846253 (patch)
tree7b67c6103b20a6fa3138c073645047dc1d231ae7 /drivers
parentf88e28f3b35226b8574af0c5a0ffc236503c8df7 (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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 3a09f93cc3b6..1f3d54434f43 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1826,7 +1826,7 @@ static int __devinit omap_hsmmc_probe(struct platform_device *pdev)
host->slot_id = 0;
host->mapbase = res->start + pdata->reg_offset;
host->base = ioremap(host->mapbase, SZ_4K);
- host->power_mode = MMC_POWER_OFF;
+ host->power_mode = -1;
host->next_data.cookie = 1;
platform_set_drvdata(pdev, host);