1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 6a35d0368117..e6c6cd6e95f2 100644
--- 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) &