Commit 135b0a28 authored Jul 06, 2015 by Ivan T. Ivanov Committed by Ulf Hansson Aug 17, 2015

mmc: sdhci: properly check card present state when quirk NO_CARD_NO_RESET is set



Controller could have both NO_CARD_NO_RESET and BROKEN_CARD_DETECTION
quirks set. Use sdhci_do_get_cd() when applying NO_CARD_NO_RESET, which
properly check for BROKEN_CARD_DETECTION quirk.

Signed-off-by: Ivan T. Ivanov <ivan.ivanov@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent c31d22eb

drivers/mmc/host/sdhci.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -207,8 +207,7 @@ EXPORT_SYMBOL_GPL(sdhci_reset);
		static void sdhci_do_reset(struct sdhci_host *host, u8 mask)
		{
		if (host->quirks & SDHCI_QUIRK_NO_CARD_NO_RESET) {
		if (!(sdhci_readl(host, SDHCI_PRESENT_STATE) &
		SDHCI_CARD_PRESENT))
		if (!sdhci_do_get_cd(host))
		return;
		}