2 files changed, 2 insertions, 5 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 964964baefa2..240c64d59267 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -587,7 +587,7 @@ __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,
                 desc->status &= ~IRQ_DISABLED;
                 desc->status |= IRQ_NOREQUEST | IRQ_NOPROBE;
                 desc->depth = 0;
-                desc->chip->unmask(irq);
+                desc->chip->startup(irq);
         }
         spin_unlock_irqrestore(&desc->lock, flags);
 }
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index ae1b684e048c..9aa3e7b81389 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -397,10 +397,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
                 if (!(desc->status & IRQ_NOAUTOEN)) {
                         desc->depth = 0;
                         desc->status &= ~IRQ_DISABLED;
-                        if (desc->chip->startup)
-                                desc->chip->startup(irq);
-                        else
-                                desc->chip->enable(irq);
+                        desc->chip->startup(irq);
                 } else
                         /* Undo nested disables: */
                         desc->depth = 1;