diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-27 10:25:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-27 10:25:31 -0800 |
| commit | b84f02795e3bcf197ae13a7e3ac6cc9d66d2feaa (patch) | |
| tree | 46adbd1ec56b86b4eac5cc21398469b669d3e3a5 | |
| parent | ed4d50c42d67769138b49de7dc672b76c88ee1c8 (diff) | |
| parent | e9748e0364fe82dc037d22900ff13a62d04518bf (diff) | |
| download | linux-b84f02795e3bcf197ae13a7e3ac6cc9d66d2feaa.tar.bz2 | |
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
| -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 */ |