diff options
| author |   Jaehoon Chung <jh80.chung@samsung.com> | 2011-05-11 15:52:39 +0900 |
|---|---|---|
| committer |   Chris Ball <cjb@laptop.org> | 2011-05-24 23:53:56 -0400 |
| commit | 1d6c4e0a00399de9de3f066de175eb5fcc4b7b46 (patch) | |
| tree | 793d02e138b86753f8a2eba04a8cae2eb97c9074 /drivers/mmc | |
| parent | mmc: sdhi: allow powering down controller with no card inserted (diff) | |
| download | linux-dev-1d6c4e0a00399de9de3f066de175eb5fcc4b7b46.tar.xz linux-dev-1d6c4e0a00399de9de3f066de175eb5fcc4b7b46.zip | |
mmc: dw_mmc: fixed wrong regulator_enable in suspend/resume
regulator_enable() was incorrectly placed in the suspend function
instead of the resume function.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/dw_mmc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 87e1f57ec9ba..66dcddb9c205 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1769,9 +1769,6 @@ static int dw_mci_suspend(struct platform_device *pdev, pm_message_t mesg) int i, ret; struct dw_mci *host = platform_get_drvdata(pdev); - if (host->vmmc) - regulator_enable(host->vmmc); - for (i = 0; i < host->num_slots; i++) { struct dw_mci_slot *slot = host->slot[i]; if (!slot) @@ -1798,6 +1795,9 @@ static int dw_mci_resume(struct platform_device *pdev) int i, ret; struct dw_mci *host = platform_get_drvdata(pdev); + if (host->vmmc) + regulator_enable(host->vmmc); + if (host->dma_ops->init) host->dma_ops->init(host); |