Merge remote-tracking branch 'spi/fix/core' into spi-linus

[~andy/linux] / arch / arm / mach-omap2 / pm34xx.c

diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 2d93d8b238351fa37fbc76405ba6e8382067afa2..c01859398b5448cd76ddb622791c2d412907ae76 100644 (file)
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -346,19 +346,14 @@ void omap_sram_idle(void)
 
 static void omap3_pm_idle(void)
 {
-       local_fiq_disable();
-
        if (omap_irq_pending())
-               goto out;
+               return;
 
        trace_cpu_idle(1, smp_processor_id());
 
        omap_sram_idle();
 
        trace_cpu_idle(PWR_EVENT_EXIT, smp_processor_id());
-
-out:
-       local_fiq_enable();
 }
 
 #ifdef CONFIG_SUSPEND
@@ -757,14 +752,12 @@ int __init omap3_pm_init(void)
                        pr_err("Memory allocation failed when allocating for secure sram context\n");
 
                local_irq_disable();
-               local_fiq_disable();
 
                omap_dma_global_context_save();
                omap3_save_secure_ram_context();
                omap_dma_global_context_restore();
 
                local_irq_enable();
-               local_fiq_enable();
        }
 
        omap3_save_scratchpad_contents();