Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 1d6c4e0a00399de9de3f066de175eb5fcc4b7b46

Authored by Jaehoon Chung
Committed by Chris Ball
1 parent 2595880481
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

drivers/mmc/host/dw_mmc.c
Diff comments   View file @ 1d6c4e0
... ... @@ -1769,9 +1769,6 @@
1769 1769 int i, ret;
1770 1770 struct dw_mci *host = platform_get_drvdata(pdev);
1771 1771  
1772   - if (host->vmmc)
1773   - regulator_enable(host->vmmc);
1774   -
1775 1772 for (i = 0; i < host->num_slots; i++) {
1776 1773 struct dw_mci_slot *slot = host->slot[i];
1777 1774 if (!slot)
... ... @@ -1797,6 +1794,9 @@
1797 1794 {
1798 1795 int i, ret;
1799 1796 struct dw_mci *host = platform_get_drvdata(pdev);
  1797 +
  1798 + if (host->vmmc)
  1799 + regulator_enable(host->vmmc);
1800 1800  
1801 1801 if (host->dma_ops->init)
1802 1802 host->dma_ops->init(host);