summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2015-10-06 15:24:03 -0700
committerStefan Agner <stefan.agner@toradex.com>2015-10-06 15:48:57 -0700
commit9b4e80c0327e2e56b2372be8b0152cedcbdac156 (patch)
tree3a2fa9e9431d6343d04e82687cf6afd223613841
parent5d117635b760de1f9f413eb4605e3d8c71dced58 (diff)
mmc: sdhci-esdhc-imx: fix polling when cd GPIO is specified
Since the driver started using mmc_of_parse, the quirk SDHCI_QUIRK_BROKEN_CARD_DETECTION did not get cleared anymore. This lead to polling mode even beeing used even when a valid GPIO has been specified. Fixes: 8d86e4fcccf6 ("mmc: sdhci-esdhc-imx: Call mmc_of_parse()")
-rw-r--r--drivers/mmc/host/sdhci-esdhc-imx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 7b7b3a319d8a..a44759931888 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -1014,7 +1014,8 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
}
/* card_detect */
- if (boarddata->cd_type == ESDHC_CD_CONTROLLER)
+ if (boarddata->cd_type == ESDHC_CD_GPIO ||
+ boarddata->cd_type == ESDHC_CD_CONTROLLER)
host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;
switch (boarddata->max_bus_width) {