Преглед на файлове

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>
Jaehoon Chung преди 14 години
родител
ревизия
1d6c4e0a00
променени са 1 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 3 3
      drivers/mmc/host/dw_mmc.c

+ 3 - 3
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;
 	int i, ret;
 	struct dw_mci *host = platform_get_drvdata(pdev);
 	struct dw_mci *host = platform_get_drvdata(pdev);
 
 
-	if (host->vmmc)
-		regulator_enable(host->vmmc);
-
 	for (i = 0; i < host->num_slots; i++) {
 	for (i = 0; i < host->num_slots; i++) {
 		struct dw_mci_slot *slot = host->slot[i];
 		struct dw_mci_slot *slot = host->slot[i];
 		if (!slot)
 		if (!slot)
@@ -1798,6 +1795,9 @@ static int dw_mci_resume(struct platform_device *pdev)
 	int i, ret;
 	int i, ret;
 	struct dw_mci *host = platform_get_drvdata(pdev);
 	struct dw_mci *host = platform_get_drvdata(pdev);
 
 
+	if (host->vmmc)
+		regulator_enable(host->vmmc);
+
 	if (host->dma_ops->init)
 	if (host->dma_ops->init)
 		host->dma_ops->init(host);
 		host->dma_ops->init(host);