Merge "mmc: core: Update SD card removal logic based on cd gpio state"

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / mmc / core / core.c

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 6423c39..e4e4e04 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -4528,9 +4528,11 @@ int mmc_pm_notify(struct notifier_block *notify_block,
        int err = 0, present = 0;
 
        switch (mode) {
+       case PM_RESTORE_PREPARE:
        case PM_HIBERNATION_PREPARE:
+               if (host->bus_ops && host->bus_ops->pre_hibernate)
+                       host->bus_ops->pre_hibernate(host);
        case PM_SUSPEND_PREPARE:
-       case PM_RESTORE_PREPARE:
                spin_lock_irqsave(&host->lock, flags);
                host->rescan_disable = 1;
                spin_unlock_irqrestore(&host->lock, flags);
@@ -4562,9 +4564,11 @@ int mmc_pm_notify(struct notifier_block *notify_block,
                host->pm_flags = 0;
                break;
 
-       case PM_POST_SUSPEND:
-       case PM_POST_HIBERNATION:
        case PM_POST_RESTORE:
+       case PM_POST_HIBERNATION:
+               if (host->bus_ops && host->bus_ops->post_hibernate)
+                       host->bus_ops->post_hibernate(host);
+       case PM_POST_SUSPEND:
 
                spin_lock_irqsave(&host->lock, flags);
                host->rescan_disable = 0;