mmc: tegra: fix mmc pm flags and capabilities
Mayuresh Kulkarni [Fri, 16 Dec 2011 12:42:02 +0000 (17:42 +0530)]
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>

drivers/mmc/host/sdhci-tegra.c

index cef05c5..5822b8e 100644 (file)
@@ -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