From 10b0a579ec30b58746b7a9ab622a12e2525ceb55 Mon Sep 17 00:00:00 2001 From: mgross Date: Wed, 9 Nov 2011 13:31:15 -0800 Subject: [PATCH] cherry-pick clean up betwen the new AOSP android-3.0 and our tree Change-Id: I70ae3e1fb39faaf653f95bf05cd0b00da4fcf850 --- drivers/mmc/core/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index b7f7e84..2755cc5 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -855,6 +855,7 @@ int mmc_host_lazy_disable(struct mmc_host *host) if (--host->nesting_cnt) return 0; + if (!host->enabled) return 0; if (host->disable_delay) { @@ -2136,7 +2137,6 @@ void mmc_rescan(struct work_struct *work) out: if (host->caps & MMC_CAP_NEEDS_POLL) mmc_schedule_delayed_work(&host->detect, HZ); - } } void mmc_start_host(struct mmc_host *host) -- 2.7.4