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
Merge branch 'staging-next' into Linux 3.1
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
pm.c
diff --git
a/arch/arm/mach-omap2/pm.c
b/arch/arm/mach-omap2/pm.c
index
3feb359
..
472bf22
100644
(file)
--- a/
arch/arm/mach-omap2/pm.c
+++ b/
arch/arm/mach-omap2/pm.c
@@
-130,7
+130,6
@@
int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state)
} else {
hwsup = clkdm_in_hwsup(pwrdm->pwrdm_clkdms[0]);
clkdm_wakeup(pwrdm->pwrdm_clkdms[0]);
} else {
hwsup = clkdm_in_hwsup(pwrdm->pwrdm_clkdms[0]);
clkdm_wakeup(pwrdm->pwrdm_clkdms[0]);
- pwrdm_wait_transition(pwrdm);
sleep_switch = FORCEWAKEUP_SWITCH;
}
}
sleep_switch = FORCEWAKEUP_SWITCH;
}
}
@@
-156,7
+155,6
@@
int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state)
return ret;
}
return ret;
}
- pwrdm_wait_transition(pwrdm);
pwrdm_state_switch(pwrdm);
err:
return ret;
pwrdm_state_switch(pwrdm);
err:
return ret;