Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b84f0279 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

drivers/mmc/host/dw_mmc.c

+4 −3
Original line number Diff line number Diff line
@@ -3354,11 +3354,12 @@ 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);



		/* 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 */

	dw_mci_enable_cd(host);