mmc: sdhci: prevent card detection activity for non-removable cards

Do not enable card detection interrupts for non-removable cards.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 6a35d03681178d5fab96357efc8922f1d10df56e..e6c6cd6e95f2303f8c43515ea2b0c001c5b4c211 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -146,10 +146,9 @@ static void sdhci_set_card_detection(struct sdhci_host *host, bool enable)
 {
        u32 present, irqs;
 
-       if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION)
-               return;
-
-       if (host->quirks2 & SDHCI_QUIRK2_OWN_CARD_DETECTION)
+       if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) ||
+           (host->quirks2 & SDHCI_QUIRK2_OWN_CARD_DETECTION) ||
+           !mmc_card_is_removable(host->mmc))
                return;
 
        present = sdhci_readl(host, SDHCI_PRESENT_STATE) &