diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-09 01:18:14 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-09 01:18:14 +0100 |
| commit | 56c7303e62996fc7b49aea1fd967ccdf94f3a5d9 (patch) | |
| tree | 9e5ff563595eb3d5d274a293d87fb811d168e762 /drivers/mmc/host/dw_mmc.c | |
| parent | cpufreq: intel_pstate: Disable energy efficiency optimization (diff) | |
| parent | cpufreq: Fix typos in comments (diff) | |
| download | linux-56c7303e62996fc7b49aea1fd967ccdf94f3a5d9.tar.xz linux-56c7303e62996fc7b49aea1fd967ccdf94f3a5d9.zip | |
Merge back earlier cpufreq changes for v4.11.
Diffstat (limited to 'drivers/mmc/host/dw_mmc.c')
| -rw-r--r-- | drivers/mmc/host/dw_mmc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index b44306b886cb..73db08558e4d 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -3354,10 +3354,11 @@ int dw_mci_runtime_resume(struct device *dev) if (!slot) continue; - if (slot->mmc->pm_flags & MMC_PM_KEEP_POWER) { + if (slot->mmc->pm_flags & MMC_PM_KEEP_POWER) dw_mci_set_ios(slot->mmc, &slot->mmc->ios); - dw_mci_setup_bus(slot, true); - } + + /* Force setup bus to guarantee available clock output */ + dw_mci_setup_bus(slot, true); } /* Now that slots are all setup, we can enable card detect */ |