commit c1b55bfcb3e5599eb5e67efed70698ade02add4e
author Sascha Hauer <s.hauer@pengutronix.de> Thu Dec 05 14:34:46 2013 +0100
committer Chris Ball <chris@printf.net> Mon Jan 13 12:48:17 2014 -0500
tree b13f59539096bb8e14b2b8a5244370f8b5b2a251
parent 07c001c119c7de92be9c8ad1f1a3e5af459cb3d4

mmc: Do not call get_cd for non removable cards

Non removable cards are always present, so do not call get_cd for them.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

drivers/mmc/core/core.c

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 57a2b40..098374b 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2460,7 +2460,8 @@
 	 */
 	mmc_bus_put(host);
 
-	if (host->ops->get_cd && host->ops->get_cd(host) == 0) {
+	if (!(host->caps & MMC_CAP_NONREMOVABLE) && host->ops->get_cd &&
+			host->ops->get_cd(host) == 0) {
 		mmc_claim_host(host);
 		mmc_power_off(host);
 		mmc_release_host(host);