projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1d6c4e0
)
mmc: core: clear MMC_PM_KEEP_POWER flag on resume
author
Eliad Peller
<eliad@wizery.com>
Mon, 9 May 2011 08:32:31 +0000
(11:32 +0300)
committer
Chris Ball
<cjb@laptop.org>
Wed, 25 May 2011 03:53:56 +0000
(23:53 -0400)
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>
drivers/mmc/core/core.c
patch
|
blob
|
history
diff --git
a/drivers/mmc/core/core.c
b/drivers/mmc/core/core.c
index
61c6c0b
..
72e113e
100644
(file)
--- 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;