git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: OMAP2+: powerdomain: Wait for powerdomain transition in pwrdm_state_switch()
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
powerdomain.c
diff --git
a/arch/arm/mach-omap2/powerdomain.c
b/arch/arm/mach-omap2/powerdomain.c
index
8a18d1b
..
96ad3db
100644
(file)
--- a/
arch/arm/mach-omap2/powerdomain.c
+++ b/
arch/arm/mach-omap2/powerdomain.c
@@
-972,7
+972,13
@@
int pwrdm_wait_transition(struct powerdomain *pwrdm)
int pwrdm_state_switch(struct powerdomain *pwrdm)
{
int pwrdm_state_switch(struct powerdomain *pwrdm)
{
- return _pwrdm_state_switch(pwrdm, PWRDM_STATE_NOW);
+ int ret;
+
+ ret = pwrdm_wait_transition(pwrdm);
+ if (!ret)
+ ret = _pwrdm_state_switch(pwrdm, PWRDM_STATE_NOW);
+
+ return ret;
}
int pwrdm_clkdm_state_switch(struct clockdomain *clkdm)
}
int pwrdm_clkdm_state_switch(struct clockdomain *clkdm)