mmc: core: Do not rescan non-removable devices

If MMC_CAP_NONREMOVABLE is set, only issue a detect job on init.

Signed-off-by: Johan Rudholm <johan.rudholm@stericsson.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 835c9f001a10..af2c4d2fd69e 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2053,6 +2053,11 @@ void mmc_rescan(struct work_struct *work)
         if (host->rescan_disable)
                 return;
 
+        /* If there is a non-removable card registered, only scan once */
+        if ((host->caps & MMC_CAP_NONREMOVABLE) && host->rescan_entered)
+                return;
+        host->rescan_entered = 1;
+
         mmc_bus_get(host);
 
         /*