From c1b55bfcb3e5599eb5e67efed70698ade02add4e Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Dec 2013 14:34:46 +0100 Subject: 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 Acked-by: Ulf Hansson Signed-off-by: Chris Ball --- drivers/mmc/core/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/mmc/core/core.c') diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 57a2b403bf8e..098374b1ab2b 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2460,7 +2460,8 @@ void mmc_rescan(struct work_struct *work) */ 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); -- cgit v1.2.3