Merge branches 'pm-sleep', 'pm-cpufreq' and 'pm-cpuidle'

[firefly-linux-kernel-4.4.55.git] / kernel / irq / chip.c

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 6397df2d6945b09ae853c1a75e4d18aa6da7096f..a2b28a2fd7b16d270c45b3c40719a35d0034c58d 100644 (file)
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -40,10 +40,9 @@ int irq_set_chip(unsigned int irq, struct irq_chip *chip)
        irq_put_desc_unlock(desc, flags);
        /*
         * For !CONFIG_SPARSE_IRQ make the irq show up in
-        * allocated_irqs. For the CONFIG_SPARSE_IRQ case, it is
-        * already marked, and this call is harmless.
+        * allocated_irqs.
         */
-       irq_reserve_irq(irq);
+       irq_mark_irq(irq);
        return 0;
 }
 EXPORT_SYMBOL(irq_set_chip);