2 files changed, 1 insertions, 7 deletions

diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index d44e0e2f1106..841ba19d64a6 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -486,7 +486,6 @@ int __init omap3_pm_init(void)
         ret = request_irq(omap_prcm_event_to_irq("io"),
                 _prcm_int_handle_io, IRQF_SHARED | IRQF_NO_SUSPEND, "pm_io",
                 omap3_pm_init);
-        enable_irq(omap_prcm_event_to_irq("io"));
 
         if (ret) {
                 pr_err("pm: Failed to request pm_io irq\n");
diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c
index 382e236fbfd9..64f6451499a7 100644
--- a/arch/arm/mach-omap2/prm3xxx.c
+++ b/arch/arm/mach-omap2/prm3xxx.c
@@ -692,7 +692,6 @@ static int omap3xxx_prm_late_init(void)
 {
         struct device_node *np;
         int irq_num;
-        int ret;
 
         if (!(prm_features & PRM_HAS_IO_WAKEUP))
                 return 0;
@@ -712,12 +711,8 @@ static int omap3xxx_prm_late_init(void)
         }
 
         omap3xxx_prm_enable_io_wakeup();
-        ret = omap_prcm_register_chain_handler(&omap3_prcm_irq_setup);
-        if (!ret)
-                irq_set_status_flags(omap_prcm_event_to_irq("io"),
-                                     IRQ_NOAUTOEN);
 
-        return ret;
+        return omap_prcm_register_chain_handler(&omap3_prcm_irq_setup);
 }
 
 static void __exit omap3xxx_prm_exit(void)