2 files changed, 13 insertions, 2 deletions

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 1f5888b42b2c..80cc7847c531 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2426,8 +2426,17 @@ int sdhci_resume_host(struct sdhci_host *host)
         if (ret)
                 return ret;
 
-        sdhci_init(host, (host->mmc->pm_flags & MMC_PM_KEEP_POWER));
-        mmiowb();
+        if ((host->mmc->pm_flags & MMC_PM_KEEP_POWER) &&
+            (host->quirks2 & SDHCI_QUIRK2_HOST_OFF_CARD_ON)) {
+                /* Card keeps power but host controller does not */
+                sdhci_init(host, 0);
+                host->pwr = 0;
+                host->clock = 0;
+                sdhci_do_set_ios(host, &host->mmc->ios);
+        } else {
+                sdhci_init(host, (host->mmc->pm_flags & MMC_PM_KEEP_POWER));
+                mmiowb();
+        }
 
         ret = mmc_resume_host(host->mmc);
         sdhci_enable_card_detection(host);
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index c750f85177d9..e9051e1cb1ce 100644
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -90,6 +90,8 @@ struct sdhci_host {
 
         unsigned int quirks2;   /* More deviations from spec. */
 
+#define SDHCI_QUIRK2_HOST_OFF_CARD_ON                   (1<<0)
+
         int irq;                /* Device IRQ */
         void __iomem *ioaddr;   /* Mapped address */