diff options
| author |   Eliad Peller <eliad@wizery.com> | 2011-05-09 11:32:31 +0300 |
|---|---|---|
| committer |   Chris Ball <cjb@laptop.org> | 2011-05-24 23:53:56 -0400 |
| commit | a8e6df7343cf67c9104955da0de70075a6ee1dfd (patch) | |
| tree | 5368d2c28837b304461e3fabf7f78ac76e671200 /drivers/mmc/core/core.c | |
| parent | mmc: dw_mmc: fixed wrong regulator_enable in suspend/resume (diff) | |
| download | linux-dev-a8e6df7343cf67c9104955da0de70075a6ee1dfd.tar.xz linux-dev-a8e6df7343cf67c9104955da0de70075a6ee1dfd.zip | |
mmc: core: clear MMC_PM_KEEP_POWER flag on resume
Since the MMC_PM_KEEP_POWER flag should be set on each suspend,
it should also cleared on each resume.
Upon resuming, we have to know if power was kept
(for re-initialization, etc.), so clear it just after resuming.
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/core/core.c')
| -rw-r--r-- | drivers/mmc/core/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 61c6c0b8f0e0..72e113e7f253 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1829,6 +1829,7 @@ int mmc_resume_host(struct mmc_host *host) err = 0; } } + host->pm_flags &= ~MMC_PM_KEEP_POWER; mmc_bus_put(host); return err; |