Commit b84f0279 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'mmc-v4.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull MMC fix from Ulf Hansson:
 "MMC host: fix runtime PM resume path in dw_mmc"

* tag 'mmc-v4.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: dw_mmc: force setup bus if active slots exist
parents ed4d50c4 e9748e03
...@@ -3354,11 +3354,12 @@ int dw_mci_runtime_resume(struct device *dev) ...@@ -3354,11 +3354,12 @@ int dw_mci_runtime_resume(struct device *dev)
if (!slot) if (!slot)
continue; 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_set_ios(slot->mmc, &slot->mmc->ios);
/* Force setup bus to guarantee available clock output */
dw_mci_setup_bus(slot, true); dw_mci_setup_bus(slot, true);
} }
}
/* Now that slots are all setup, we can enable card detect */ /* Now that slots are all setup, we can enable card detect */
dw_mci_enable_cd(host); dw_mci_enable_cd(host);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment