commit 923d85774b538864d449ad7ce28054998f9b6bfb
author Linux Build Service Account <lnxbuild@localhost> Fri Jul 26 04:22:34 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jul 26 04:22:29 2013 -0700
tree b8d2d327e164c4e7cdc7100f893d8436a93e6dc2
parent 450b8d8808e4af9c30277e63cf18e5eede36f21d
parent 4dc6041f28a3e5e5aed11c560df6072b7da01593

Merge "mmc: sdhci-msm: add MMC_PM_KEEP_POWER flag"

drivers/mmc/host/sdhci-msm.c

diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index 3495f4d..96f8f2e 100644
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -2472,6 +2472,7 @@
 	msm_host->mmc->caps2 |= MMC_CAP2_CLK_SCALE;
 	msm_host->mmc->caps2 |= MMC_CAP2_STOP_REQUEST;
 	msm_host->mmc->caps2 |= MMC_CAP2_ASYNC_SDIO_IRQ_4BIT_MODE;
+	msm_host->mmc->pm_caps |= MMC_PM_KEEP_POWER;
 
 	if (msm_host->pdata->nonremovable)
 		msm_host->mmc->caps |= MMC_CAP_NONREMOVABLE;