diff options
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 11 | 
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 7be3622cfc8..c01859398b5 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -346,21 +346,14 @@ void omap_sram_idle(void)  static void omap3_pm_idle(void)  { -	local_fiq_disable(); -  	if (omap_irq_pending()) -		goto out; +		return; -	trace_power_start(POWER_CSTATE, 1, smp_processor_id());  	trace_cpu_idle(1, smp_processor_id());  	omap_sram_idle(); -	trace_power_end(smp_processor_id());  	trace_cpu_idle(PWR_EVENT_EXIT, smp_processor_id()); - -out: -	local_fiq_enable();  }  #ifdef CONFIG_SUSPEND @@ -759,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();  |