Commit 46ed0810 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

Merge branch 'fixes' into next

parents 98991b18 32a9e0c4

drivers/mmc/host/tmio_mmc_core.c

+3 −3
Original line number Diff line number Diff line
@@ -929,9 +929,9 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
	switch (ios->power_mode) {

	case MMC_POWER_OFF:

		tmio_mmc_power_off(host);

		/* Downgrade ensures a sane state for tuning HW (e.g. SCC) */

		if (host->mmc->ops->hs400_downgrade)

			host->mmc->ops->hs400_downgrade(host->mmc);

		/* For R-Car Gen2+, we need to reset SDHI specific SCC */

		if (host->pdata->flags & TMIO_MMC_MIN_RCAR2)

			host->reset(host);

		host->set_clock(host, 0);

		break;

	case MMC_POWER_UP: