summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOm Prakash Singh <omp@nvidia.com>2012-02-22 11:25:17 +0530
committerLokesh Pathak <lpathak@nvidia.com>2012-02-23 05:11:34 -0800
commitdc0d386089f96026ba60b75695ca64fd2e58ac80 (patch)
tree6e265c06161cdc244b2358f94bbf1ccdf9329304
parentd15177bea60854a9f3be24992a68e3acb71eac98 (diff)
Revert "mmc: tegra: enabling MMC_PM_KEEP_POWER flag for built_in devices"
This reverts commit caa6566d4fb8539d09276c1bcb818444af675624. MMC_PM_KEEP_POWER should be used only for sdio as power-on/off code is implemented only for sdio. This may also create regression in power. Bug 938011 Bug 943131 Change-Id: I41a29acb3dd6f3396c97ab78f9704f9b39359675 Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-on: http://git-master/r/85213 Reviewed-by: Om Prakash Singh <omp@nvidia.com> Tested-by: Om Prakash Singh <omp@nvidia.com>
-rw-r--r--drivers/mmc/host/sdhci-tegra.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index 54ddc09897cd..6d61aaee5fbe 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -1057,7 +1057,7 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev)
host->mmc->pm_caps |= MMC_PM_KEEP_POWER | MMC_PM_IGNORE_PM_NOTIFY;
if (plat->mmc_data.built_in) {
host->mmc->caps |= MMC_CAP_NONREMOVABLE;
- host->mmc->pm_flags |= MMC_PM_IGNORE_PM_NOTIFY | MMC_PM_KEEP_POWER;
+ host->mmc->pm_flags |= MMC_PM_IGNORE_PM_NOTIFY;
}
/* Do not turn OFF embedded sdio cards as it support Wake on Wireless */
if (plat->mmc_data.embedded_sdio)