diff options
Diffstat (limited to 'arch/blackfin/mach-common/pm.c')
-rw-r--r-- | arch/blackfin/mach-common/pm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c index 96600b8cb6ad..d3d70fd67c16 100644 --- a/arch/blackfin/mach-common/pm.c +++ b/arch/blackfin/mach-common/pm.c | |||
@@ -71,7 +71,7 @@ void bfin_pm_suspend_standby_enter(void) | |||
71 | gpio_pm_wakeup_request(CONFIG_PM_WAKEUP_GPIO_NUMBER, WAKEUP_TYPE); | 71 | gpio_pm_wakeup_request(CONFIG_PM_WAKEUP_GPIO_NUMBER, WAKEUP_TYPE); |
72 | #endif | 72 | #endif |
73 | 73 | ||
74 | local_irq_save(flags); | 74 | local_irq_save_hw(flags); |
75 | bfin_pm_standby_setup(); | 75 | bfin_pm_standby_setup(); |
76 | 76 | ||
77 | #ifdef CONFIG_PM_BFIN_SLEEP_DEEPER | 77 | #ifdef CONFIG_PM_BFIN_SLEEP_DEEPER |
@@ -105,7 +105,7 @@ void bfin_pm_suspend_standby_enter(void) | |||
105 | bfin_write_SIC_IWR(IWR_DISABLE_ALL); | 105 | bfin_write_SIC_IWR(IWR_DISABLE_ALL); |
106 | #endif | 106 | #endif |
107 | 107 | ||
108 | local_irq_restore(flags); | 108 | local_irq_restore_hw(flags); |
109 | } | 109 | } |
110 | 110 | ||
111 | int bf53x_suspend_l1_mem(unsigned char *memptr) | 111 | int bf53x_suspend_l1_mem(unsigned char *memptr) |
@@ -249,12 +249,12 @@ int bfin_pm_suspend_mem_enter(void) | |||
249 | wakeup |= GPWE; | 249 | wakeup |= GPWE; |
250 | #endif | 250 | #endif |
251 | 251 | ||
252 | local_irq_save(flags); | 252 | local_irq_save_hw(flags); |
253 | 253 | ||
254 | ret = blackfin_dma_suspend(); | 254 | ret = blackfin_dma_suspend(); |
255 | 255 | ||
256 | if (ret) { | 256 | if (ret) { |
257 | local_irq_restore(flags); | 257 | local_irq_restore_hw(flags); |
258 | kfree(memptr); | 258 | kfree(memptr); |
259 | return ret; | 259 | return ret; |
260 | } | 260 | } |
@@ -275,7 +275,7 @@ int bfin_pm_suspend_mem_enter(void) | |||
275 | bfin_gpio_pm_hibernate_restore(); | 275 | bfin_gpio_pm_hibernate_restore(); |
276 | blackfin_dma_resume(); | 276 | blackfin_dma_resume(); |
277 | 277 | ||
278 | local_irq_restore(flags); | 278 | local_irq_restore_hw(flags); |
279 | kfree(memptr); | 279 | kfree(memptr); |
280 | 280 | ||
281 | return 0; | 281 | return 0; |