diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 835c9f001a10e0beea374a5f37bcc7ec1a369292..af2c4d2fd69e6eb9ad24c382388a9f754cd36ebc 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);
 
 	/*
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index f578a71d82a6b71bd1c9203b53e77713c4543065..d5d9bd4c5aa83678fbbd4bedfa4155e9c0fb2d60 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -300,6 +300,7 @@ struct mmc_host {
 #endif
 
 	int			rescan_disable;	/* disable card detection */
+	int			rescan_entered;	/* used with nonremovable devices */
 
 	struct mmc_card		*card;		/* device attached to this host */