diff options
author | Jaehoon Chung <jh80.chung@samsung.com> | 2011-05-11 02:52:39 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2011-05-24 23:53:56 -0400 |
commit | 1d6c4e0a00399de9de3f066de175eb5fcc4b7b46 (patch) | |
tree | 793d02e138b86753f8a2eba04a8cae2eb97c9074 /drivers/mmc/host/dw_mmc.c | |
parent | 2595880481ac894d390365092de9aaf92b44e147 (diff) |
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/host/dw_mmc.c')
-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) | |||
1769 | int i, ret; | 1769 | int i, ret; |
1770 | struct dw_mci *host = platform_get_drvdata(pdev); | 1770 | struct dw_mci *host = platform_get_drvdata(pdev); |
1771 | 1771 | ||
1772 | if (host->vmmc) | ||
1773 | regulator_enable(host->vmmc); | ||
1774 | |||
1775 | for (i = 0; i < host->num_slots; i++) { | 1772 | for (i = 0; i < host->num_slots; i++) { |
1776 | struct dw_mci_slot *slot = host->slot[i]; | 1773 | struct dw_mci_slot *slot = host->slot[i]; |
1777 | if (!slot) | 1774 | if (!slot) |
@@ -1798,6 +1795,9 @@ static int dw_mci_resume(struct platform_device *pdev) | |||
1798 | int i, ret; | 1795 | int i, ret; |
1799 | struct dw_mci *host = platform_get_drvdata(pdev); | 1796 | struct dw_mci *host = platform_get_drvdata(pdev); |
1800 | 1797 | ||
1798 | if (host->vmmc) | ||
1799 | regulator_enable(host->vmmc); | ||
1800 | |||
1801 | if (host->dma_ops->init) | 1801 | if (host->dma_ops->init) |
1802 | host->dma_ops->init(host); | 1802 | host->dma_ops->init(host); |
1803 | 1803 | ||