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 remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
pm34xx.c
diff --git
a/arch/arm/mach-omap2/pm34xx.c
b/arch/arm/mach-omap2/pm34xx.c
index
8cbbead
..
a4aa192
100644
(file)
--- a/
arch/arm/mach-omap2/pm34xx.c
+++ b/
arch/arm/mach-omap2/pm34xx.c
@@
-398,7
+398,7
@@
void omap_sram_idle(void)
if (!is_suspending())
if (per_next_state < PWRDM_POWER_ON ||
core_next_state < PWRDM_POWER_ON)
if (!is_suspending())
if (per_next_state < PWRDM_POWER_ON ||
core_next_state < PWRDM_POWER_ON)
- if (
try_acquire_console_sem
())
+ if (
!console_trylock
())
goto console_still_active;
/* PER */
goto console_still_active;
/* PER */
@@
-481,7
+481,7
@@
void omap_sram_idle(void)
}
if (!is_suspending())
}
if (!is_suspending())
-
release_console_sem
();
+
console_unlock
();
console_still_active:
/* Disable IO-PAD and IO-CHAIN wakeup */
console_still_active:
/* Disable IO-PAD and IO-CHAIN wakeup */