summaryrefslogtreecommitdiff
path: root/drivers/mmc/core
diff options
context:
space:
mode:
authorSan Mehat <san@google.com>2009-07-30 08:21:19 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:37:58 -0800
commitcc106cbdc4ea09836ad07a1988cc4d0edf74a48a (patch)
treef0cc1c75e966418882e1459b14935254baa02578 /drivers/mmc/core
parentbeb9eb38c6eb46c3ba9028356c3abe8d2f62cafd (diff)
mmc: mmcblk: Add support for deferred SD bus resume
Signed-off-by: San Mehat <san@google.com> mmc: card: Add MMC_BLOCK_DEFERRED_RESUME option to Kconfig Signed-off-by: San Mehat <san@google.com>
Diffstat (limited to 'drivers/mmc/core')
-rw-r--r--drivers/mmc/core/core.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index e8d6ff48e2d8..2b4a9ad728fc 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1804,6 +1804,12 @@ void mmc_rescan(struct work_struct *work)
&& !(host->caps & MMC_CAP_NONREMOVABLE))
host->bus_ops->detect(host);
+ /* If the card was removed the bus will be marked
+ * as dead - extend the wakelock so userspace
+ * can respond */
+ if (host->bus_dead)
+ extend_wakelock = 1;
+
/*
* Let mmc_bus_put() free the bus/bus_ops if we've found that
* the card is no longer present.