mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
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>
This commit is contained in:
parent
2595880481
commit
1d6c4e0a00
1 changed files with 3 additions and 3 deletions
|
@ -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);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue