diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-11 17:53:01 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-11 17:53:01 -0400 |
| commit | c2fda22207e2977d0b80eac58a9004b6f8beed6d (patch) | |
| tree | 0c82957b9d6fb53aafe0f9a9d54de6015484e3e6 /arch/arm/mach-omap2/pm.c | |
| parent | fdcc205fb9ba006bcd37f72e1b1b904704257351 (diff) | |
| parent | e4609747a33b903c03346eea20d811fafd462269 (diff) | |
Merge branch 'fixes-part-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap/fixes
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 49486f522dca..d48813fd62de 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c | |||
| @@ -106,7 +106,7 @@ static void omap2_init_processor_devices(void) | |||
| 106 | int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) | 106 | int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) |
| 107 | { | 107 | { |
| 108 | u32 cur_state; | 108 | u32 cur_state; |
| 109 | int sleep_switch = 0; | 109 | int sleep_switch = -1; |
| 110 | int ret = 0; | 110 | int ret = 0; |
| 111 | 111 | ||
| 112 | if (pwrdm == NULL || IS_ERR(pwrdm)) | 112 | if (pwrdm == NULL || IS_ERR(pwrdm)) |