2 files changed, 1 insertions, 4 deletions

diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 3f1f656348fc..a9f4034aa70a 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -130,9 +130,6 @@ static void omap3_save_secure_ram_context(u32 target_mpu_state)
         u32 ret;
 
         if (omap_type() != OMAP2_DEVICE_TYPE_GP) {
-                /* Disable dma irq before calling secure rom code API */
-                omap_dma_disable_irq(0);
-                omap_dma_disable_irq(1);
                 /*
                  * MPU next state must be set to POWER_ON temporarily,
                  * otherwise the WFI executed inside the ROM code
diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S
index db75167bc52d..b6abadccb1c6 100644
--- a/arch/arm/mach-omap2/sleep34xx.S
+++ b/arch/arm/mach-omap2/sleep34xx.S
@@ -68,7 +68,7 @@ save_secure_ram_debug:
         mov     r0, #25                 @ set service ID for PPA
         mov     r12, r0                 @ copy secure service ID in r12
         mov     r1, #0                  @ set task id for ROM code in r1
-        mov     r2, #7                  @ set some flags in r2, r6
+        mov     r2, #4                  @ set some flags in r2, r6
         mov     r6, #0xff
         mcr     p15, 0, r0, c7, c10, 4  @ data write barrier
         mcr     p15, 0, r0, c7, c10, 5  @ data memory barrier