diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2010-09-16 07:33:21 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-16 07:33:21 +0200 |
| commit | c91925db4925ba0d145478f02c093369196936e9 (patch) | |
| tree | 0e5da4211de3c18b65337c3094ec15994cf2534a /drivers/mmc/host/omap_hsmmc.c | |
| parent | ALSA: hda - Set up COEFs for ALC269 to avoid click noises at power-saving (diff) | |
| parent | ALSA: patch_nvhdmi.c: Fix supported sample rate list. (diff) | |
| download | linux-dev-c91925db4925ba0d145478f02c093369196936e9.tar.xz linux-dev-c91925db4925ba0d145478f02c093369196936e9.zip | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'drivers/mmc/host/omap_hsmmc.c')
| -rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 4a8776f8afdd..4526d2791f29 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -2305,7 +2305,6 @@ static int omap_hsmmc_suspend(struct device *dev) int ret = 0; struct platform_device *pdev = to_platform_device(dev); struct omap_hsmmc_host *host = platform_get_drvdata(pdev); - pm_message_t state = PMSG_SUSPEND; /* unused by MMC core */ if (host && host->suspended) return 0; @@ -2324,8 +2323,8 @@ static int omap_hsmmc_suspend(struct device *dev) } } cancel_work_sync(&host->mmc_carddetect_work); - mmc_host_enable(host->mmc); ret = mmc_suspend_host(host->mmc); + mmc_host_enable(host->mmc); if (ret == 0) { omap_hsmmc_disable_irq(host); OMAP_HSMMC_WRITE(host->base, HCTL, |