tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds b84f0279 ed4d50c4

+4 -3
unified split
+4 -3
drivers/mmc/host/dw_mmc.c
··· 3354 3354 3355 3355 if (!slot) 3356 3356 continue; 3357 - if (slot->mmc->pm_flags & MMC_PM_KEEP_POWER) { 3357 + if (slot->mmc->pm_flags & MMC_PM_KEEP_POWER) 3358 3358 dw_mci_set_ios(slot->mmc, &slot->mmc->ios); 3359 - dw_mci_setup_bus(slot, true); 3360 - } 3359 + 3360 + /* Force setup bus to guarantee available clock output */ 3361 + dw_mci_setup_bus(slot, true); 3361 3362 } 3362 3363 3363 3364 /* Now that slots are all setup, we can enable card detect */