From: Ivan T. Ivanov Date: Mon, 6 Jul 2015 12:16:20 +0000 (+0300) Subject: mmc: sdhci: don't use card state polling when CD GPIO is defined X-Git-Tag: v4.3-rc1~46^2~58 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c31d22eb335d4e3d2016135038fac8daaa9708d6;p=karo-tx-linux.git mmc: sdhci: don't use card state polling when CD GPIO is defined There is no reason to use polling for card detection state change when drivers are using dedicated GPIO for this. Don't poll in this case. Signed-off-by: Ivan T. Ivanov Signed-off-by: Ulf Hansson --- diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index f85476f86c71..cb138d6ad1f2 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -3135,7 +3135,8 @@ int sdhci_add_host(struct sdhci_host *host) mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED; if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) && - !(mmc->caps & MMC_CAP_NONREMOVABLE)) + !(mmc->caps & MMC_CAP_NONREMOVABLE) && + IS_ERR_VALUE(mmc_gpio_get_cd(host->mmc))) mmc->caps |= MMC_CAP_NEEDS_POLL; /* If there are external regulators, get them */