Merge "mmc: block: Fix issue with deferred resume when CQ is enabled"

[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 152a3e3..9f5c67e 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2148,6 +2148,10 @@ void mmc_get_card(struct mmc_card *card)
 {
        pm_runtime_get_sync(&card->dev);
        mmc_claim_host(card->host);
+#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME
+       if (mmc_bus_needs_resume(card->host))
+               mmc_resume_bus(card->host);
+#endif
 }
 EXPORT_SYMBOL(mmc_get_card);