Merge branch 'master' into upstream

1 files changed, 1 insertions, 5 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index ac1f850d4937..736cb0bd498f 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -40,10 +40,6 @@ int set_irq_chip(unsigned int irq, struct irq_chip *chip)
         spin_lock_irqsave(&desc->lock, flags);
         irq_chip_set_defaults(chip);
         desc->chip = chip;
-        /*
-         * For compatibility only:
-         */
-        desc->chip = chip;
         spin_unlock_irqrestore(&desc->lock, flags);
 
         return 0;
@@ -146,7 +142,7 @@ static void default_disable(unsigned int irq)
         struct irq_desc *desc = irq_desc + irq;
 
         if (!(desc->status & IRQ_DELAYED_DISABLE))
-                irq_desc[irq].chip->mask(irq);
+                desc->chip->mask(irq);
 }
 
 /*