diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2015-10-23 15:25:07 -0700 |
---|---|---|
committer | Stefan Agner <stefan.agner@toradex.com> | 2015-10-23 15:25:07 -0700 |
commit | 9ac0b253c59216c9614436b2006d0557396eb268 (patch) | |
tree | b576185854d3271bc0da2522107c86d96694ad34 /drivers | |
parent | 9bf0ce4a24d67d89a15d5095b95efe16b0bd4170 (diff) |
Revert "mmc: sdhci-esdhc-imx: fix polling when cd GPIO is specified"
Linux stable release v4.1.11 contains a different fix for this,
hence revert our fix in favor of the upstream fix.
This reverts commit 9b4e80c0327e2e56b2372be8b0152cedcbdac156.
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mmc/host/sdhci-esdhc-imx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index a44759931888..7b7b3a319d8a 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -1014,8 +1014,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) } /* card_detect */ - if (boarddata->cd_type == ESDHC_CD_GPIO || - boarddata->cd_type == ESDHC_CD_CONTROLLER) + if (boarddata->cd_type == ESDHC_CD_CONTROLLER) host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION; switch (boarddata->max_bus_width) { |