diff options
| author | Colin Cross <ccross@android.com> | 2011-12-09 15:01:16 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-12-09 15:01:16 -0800 |
| commit | 070b34dd5d0a75ff1f1dc538f91990df1b63269a (patch) | |
| tree | 94ddfa7fe4a3c00625f80afadd7b1f1de893112b /drivers/mmc | |
| parent | 5e7f036af04fea08068bf9ed8045aa1c82153bd7 (diff) | |
| parent | 3484c3ebe12163a54ec18af429112dfeafe2a4d6 (diff) | |
| download | kernel_samsung_tuna-070b34dd5d0a75ff1f1dc538f91990df1b63269a.zip kernel_samsung_tuna-070b34dd5d0a75ff1f1dc538f91990df1b63269a.tar.gz kernel_samsung_tuna-070b34dd5d0a75ff1f1dc538f91990df1b63269a.tar.bz2 | |
Merge branch 'linux-omap-3.0' into android-omap-3.0
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index c89c45c..5a754e3 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -2348,8 +2348,8 @@ static int omap_hsmmc_suspend(struct device *dev) if (mmc_slot(host).mmc_data.built_in) host->mmc->pm_flags |= MMC_PM_KEEP_POWER; ret = mmc_suspend_host(host->mmc); - mmc_host_enable(host->mmc); if (ret == 0) { + mmc_host_enable(host->mmc); omap_hsmmc_disable_irq(host); OMAP_HSMMC_WRITE(host->base, HCTL, OMAP_HSMMC_READ(host->base, HCTL) & ~SDBP); @@ -2366,13 +2366,6 @@ static int omap_hsmmc_suspend(struct device *dev) dev_dbg(mmc_dev(host->mmc), "Unmask interrupt failed\n"); } - - /* - * Directly call platform_bus suspend. runtime PM - * PM lock is held during system suspend, so will - * not be auto-matically called - */ - mmc_host_disable(host->mmc); } } |