Commit 7b552bc1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v3.19-4' of git://git.linaro.org/people/ulf.hansson/mmc 

Pull MMC bugfix from Ulf Hansson:
 "Fix sdhci regulator regression for Qualcomm and Nvidia boards"

* tag 'mmc-v3.19-4' of git://git.linaro.org/people/ulf.hansson/mmc:
  mmc: sdhci: Set SDHCI_POWER_ON with external vmmc
parents f8cb3954 3cbc6123

drivers/mmc/host/sdhci.c

+6 −0
Original line number Diff line number Diff line
@@ -1271,6 +1271,12 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned char mode, 
		spin_unlock_irq(&host->lock);

		mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);

		spin_lock_irq(&host->lock);



		if (mode != MMC_POWER_OFF)

			sdhci_writeb(host, SDHCI_POWER_ON, SDHCI_POWER_CONTROL);

		else

			sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);



		return;

	}