diff options
Diffstat (limited to 'arch/arm/mach-omap2/pm44xx.c')
-rw-r--r-- | arch/arm/mach-omap2/pm44xx.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c index ea24174f5707..04922d149068 100644 --- a/arch/arm/mach-omap2/pm44xx.c +++ b/arch/arm/mach-omap2/pm44xx.c | |||
@@ -69,9 +69,8 @@ static int omap4_pm_suspend(void) | |||
69 | list_for_each_entry(pwrst, &pwrst_list, node) { | 69 | list_for_each_entry(pwrst, &pwrst_list, node) { |
70 | state = pwrdm_read_prev_pwrst(pwrst->pwrdm); | 70 | state = pwrdm_read_prev_pwrst(pwrst->pwrdm); |
71 | if (state > pwrst->next_state) { | 71 | if (state > pwrst->next_state) { |
72 | pr_info("Powerdomain (%s) didn't enter " | 72 | pr_info("Powerdomain (%s) didn't enter target state %d\n", |
73 | "target state %d\n", | 73 | pwrst->pwrdm->name, pwrst->next_state); |
74 | pwrst->pwrdm->name, pwrst->next_state); | ||
75 | ret = -1; | 74 | ret = -1; |
76 | } | 75 | } |
77 | omap_set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state); | 76 | omap_set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state); |
@@ -189,8 +188,7 @@ int __init omap4_pm_init(void) | |||
189 | ret |= clkdm_add_wkdep(ducati_clkdm, l3_1_clkdm); | 188 | ret |= clkdm_add_wkdep(ducati_clkdm, l3_1_clkdm); |
190 | ret |= clkdm_add_wkdep(ducati_clkdm, l3_2_clkdm); | 189 | ret |= clkdm_add_wkdep(ducati_clkdm, l3_2_clkdm); |
191 | if (ret) { | 190 | if (ret) { |
192 | pr_err("Failed to add MPUSS -> L3/EMIF/L4PER, DUCATI -> L3 " | 191 | pr_err("Failed to add MPUSS -> L3/EMIF/L4PER, DUCATI -> L3 wakeup dependency\n"); |
193 | "wakeup dependency\n"); | ||
194 | goto err2; | 192 | goto err2; |
195 | } | 193 | } |
196 | 194 | ||