Skip to content

Commit

Permalink
mmc: dw_mmc: fixed wrong regulator_enable in suspend/resume
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jaehoon Chung authored and Chris Ball committed May 25, 2011
1 parent 2595880 commit 1d6c4e0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/mmc/host/dw_mmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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);

Expand Down

0 comments on commit 1d6c4e0

Please sign in to comment.