2 files changed, 61 insertions, 26 deletions

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index b69ce91b11e1..83240faa1dc8 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1057,6 +1057,17 @@ void mmc_rescan(struct work_struct *work)
                 container_of(work, struct mmc_host, detect.work);
         u32 ocr;
         int err;
+        unsigned long flags;
+
+        spin_lock_irqsave(&host->lock, flags);
+
+        if (host->rescan_disable) {
+                spin_unlock_irqrestore(&host->lock, flags);
+                return;
+        }
+
+        spin_unlock_irqrestore(&host->lock, flags);
+
 
         mmc_bus_get(host);
 
@@ -1274,19 +1285,6 @@ int mmc_suspend_host(struct mmc_host *host)
         if (host->bus_ops && !host->bus_dead) {
                 if (host->bus_ops->suspend)
                         err = host->bus_ops->suspend(host);
-                if (err == -ENOSYS || !host->bus_ops->resume) {
-                        /*
-                         * We simply "remove" the card in this case.
-                         * It will be redetected on resume.
-                         */
-                        if (host->bus_ops->remove)
-                                host->bus_ops->remove(host);
-                        mmc_claim_host(host);
-                        mmc_detach_bus(host);
-                        mmc_release_host(host);
-                        host->pm_flags = 0;
-                        err = 0;
-                }
         }
         mmc_bus_put(host);
 
@@ -1318,28 +1316,61 @@ int mmc_resume_host(struct mmc_host *host)
                         printk(KERN_WARNING "%s: error %d during resume "
                                             "(card was removed?)\n",
                                             mmc_hostname(host), err);
-                        if (host->bus_ops->remove)
-                                host->bus_ops->remove(host);
-                        mmc_claim_host(host);
-                        mmc_detach_bus(host);
-                        mmc_release_host(host);
-                        /* no need to bother upper layers */
                         err = 0;
                 }
         }
         mmc_bus_put(host);
 
-        /*
-         * We add a slight delay here so that resume can progress
-         * in parallel.
-         */
-        mmc_detect_change(host, 1);
-
         return err;
 }
-
 EXPORT_SYMBOL(mmc_resume_host);
 
+/* Do the card removal on suspend if card is assumed removeable
+ * Do that in pm notifier while userspace isn't yet frozen, so we will be able
+   to sync the card.
+*/
+int mmc_pm_notify(struct notifier_block *notify_block,
+                                        unsigned long mode, void *unused)
+{
+        struct mmc_host *host = container_of(
+                notify_block, struct mmc_host, pm_notify);
+        unsigned long flags;
+
+
+        switch (mode) {
+        case PM_HIBERNATION_PREPARE:
+        case PM_SUSPEND_PREPARE:
+
+                spin_lock_irqsave(&host->lock, flags);
+                host->rescan_disable = 1;
+                spin_unlock_irqrestore(&host->lock, flags);
+                cancel_delayed_work_sync(&host->detect);
+
+                if (!host->bus_ops || host->bus_ops->suspend)
+                        break;
+
+                mmc_claim_host(host);
+
+                if (host->bus_ops->remove)
+                        host->bus_ops->remove(host);
+
+                mmc_detach_bus(host);
+                mmc_release_host(host);
+                host->pm_flags = 0;
+                break;
+
+        case PM_POST_SUSPEND:
+        case PM_POST_HIBERNATION:
+
+                spin_lock_irqsave(&host->lock, flags);
+                host->rescan_disable = 0;
+                spin_unlock_irqrestore(&host->lock, flags);
+                mmc_detect_change(host, 0);
+
+        }
+
+        return 0;
+}
 #endif
 
 static int __init mmc_init(void)
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 47353909e345..0efe631e50ca 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -17,6 +17,7 @@
 #include <linux/pagemap.h>
 #include <linux/leds.h>
 #include <linux/slab.h>
+#include <linux/suspend.h>
 
 #include <linux/mmc/host.h>
 
@@ -85,6 +86,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
         init_waitqueue_head(&host->wq);
         INIT_DELAYED_WORK(&host->detect, mmc_rescan);
         INIT_DELAYED_WORK_DEFERRABLE(&host->disable, mmc_host_deeper_disable);
+        host->pm_notify.notifier_call = mmc_pm_notify;
 
         /*
          * By default, hosts do not support SGIO or large requests.
@@ -133,6 +135,7 @@ int mmc_add_host(struct mmc_host *host)
 #endif
 
         mmc_start_host(host);
+        register_pm_notifier(&host->pm_notify);
 
         return 0;
 }
@@ -149,6 +152,7 @@ EXPORT_SYMBOL(mmc_add_host);
  */
 void mmc_remove_host(struct mmc_host *host)
 {
+        unregister_pm_notifier(&host->pm_notify);
         mmc_stop_host(host);
 
 #ifdef CONFIG_DEBUG_FS