summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-01-02 14:25:03 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-01-02 14:25:03 -0800
commit2f817b68f06ed866aa2c4cc35b2e4293aeb1ef99 (patch)
tree6bc759618de491c88381a94fb6b79d9a98d51c1a
parentd14f6599ce3c215d75ed290f418bfd25e57826b1 (diff)
parent10803b9f2e25503557889e76ba7eb816ea1d76c9 (diff)
Merge "mmc: core: Remove flag MMC_PM_WAKE_SDIO_IRQ in mmc_resume_host"
-rw-r--r--drivers/mmc/core/sdio.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index e7ebc3cb8eda..5fedab49cf34 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -1078,6 +1078,7 @@ static int mmc_sdio_resume(struct mmc_host *host)
mmc_release_host(host);
host->pm_flags &= ~MMC_PM_KEEP_POWER;
+ host->pm_flags &= ~MMC_PM_WAKE_SDIO_IRQ;
return err;
}