Merge "mmc: sdhci: Use max timeout and skip timeout calculation" (30a3650f) · Commits · e / devices / android_kernel_sony_msm8994

drivers/mmc/host/sdhci.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -803,6 +803,12 @@ static u8 sdhci_calc_timeout(struct sdhci_host host, struct mmc_command cmd)
		if (host->quirks & SDHCI_QUIRK_BROKEN_TIMEOUT_VAL)
		return 0xE;

		/* During initialization, don't use max timeout as the clock is slow */
		if ((host->quirks2 & SDHCI_QUIRK2_USE_RESERVED_MAX_TIMEOUT) &&
		(host->clock > 400000)) {
		return 0xF;
		}

		/* Unspecified timeout, assume max */
		if (!data && !cmd->cmd_timeout_ms)
		return 0xE;