1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 722af2dce3bb..9683d4d3fced 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1506,8 +1506,12 @@ void mmc_rescan(struct work_struct *work)
 
         mmc_bus_get(host);
 
-        /* if there is a card registered, check whether it is still present */
-        if ((host->bus_ops != NULL) && host->bus_ops->detect && !host->bus_dead)
+        /*
+         * if there is a _removable_ card registered, check whether it is
+         * still present
+         */
+        if (host->bus_ops && host->bus_ops->detect && !host->bus_dead
+            && mmc_card_is_removable(host))
                 host->bus_ops->detect(host);
 
         mmc_bus_put(host);