@@ -508,7 +508,6 @@ static suspend_state_t suspend_state;
static int omap3_pm_prepare(void)
{
- disable_hlt();
return 0;
}
@@ -576,12 +575,12 @@ static int omap3_pm_enter(suspend_state_t unused)
static void omap3_pm_finish(void)
{
- enable_hlt();
}
/* Hooks to enable / disable UART interrupts during suspend */
static int omap3_pm_begin(suspend_state_t state)
{
+ disable_hlt();
suspend_state = state;
omap_uart_enable_irqs(0);
return 0;
@@ -591,6 +590,7 @@ static void omap3_pm_end(void)
{
suspend_state = PM_SUSPEND_ON;
omap_uart_enable_irqs(1);
+ enable_hlt();
return;
}