diff options
| author | Mayuresh Kulkarni <mkulkarni@nvidia.com> | 2011-12-16 18:12:02 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-16 05:03:38 -0800 |
| commit | a5147a46fae2d9dce715a5354fa280eb57210c11 (patch) | |
| tree | e270974b769299a3ee3d6b7ccfbdd2491ab05bad /drivers/mmc/host/sdhci-tegra.c | |
| parent | 6f29f9a87c82faec2d64ca42e64f92e0adfe5907 (diff) | |
mmc: tegra: fix mmc pm flags and capabilities
for bug 914934
Change-Id: I34892961074d5c23efb19a7e53688f227e0bf03d
Signed-off-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Reviewed-on: http://git-master/r/70557
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Pavan Kunapuli <pkunapuli@nvidia.com>
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'drivers/mmc/host/sdhci-tegra.c')
| -rw-r--r-- | drivers/mmc/host/sdhci-tegra.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index cef05c5baa3e..5822b8eb7d1a 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -662,14 +662,14 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev) host->mmc->caps |= MMC_CAP_8_BIT_DATA; host->mmc->caps |= MMC_CAP_SDIO_IRQ; - host->mmc->pm_caps = MMC_PM_KEEP_POWER | MMC_PM_IGNORE_PM_NOTIFY; + 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; + 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) - host->mmc->pm_flags = MMC_PM_KEEP_POWER; + host->mmc->pm_flags |= MMC_PM_KEEP_POWER; tegra_sdhost_min_freq = TEGRA_SDHOST_MIN_FREQ; #ifdef CONFIG_ARCH_TEGRA_2x_SOC |