Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Thomas Gleixner:
"A single fix for the fallout from the conversion of MIPS GIC to irq
domains"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip/mips-gic: Fix IRQs in gic_dev_domain
+11
-1
+11
-1
drivers/irqchip/irq-mips-gic.c
+11
-1
drivers/irqchip/irq-mips-gic.c
···
746
746
/* verify that it doesn't conflict with an IPI irq */
747
747
if (test_bit(spec->hwirq, ipi_resrv))
748
748
return -EBUSY;
749
+
750
+
hwirq = GIC_SHARED_TO_HWIRQ(spec->hwirq);
751
+
752
+
return irq_domain_set_hwirq_and_chip(d, virq, hwirq,
753
+
&gic_level_irq_controller,
754
+
NULL);
749
755
} else {
750
756
base_hwirq = find_first_bit(ipi_resrv, gic_shared_intrs);
751
757
if (base_hwirq == gic_shared_intrs) {
···
873
867
&gic_level_irq_controller,
874
868
NULL);
875
869
if (ret)
876
-
return ret;
870
+
goto error;
877
871
}
878
872
879
873
return 0;
874
+
875
+
error:
876
+
irq_domain_free_irqs_parent(d, virq, nr_irqs);
877
+
return ret;
880
878
}
881
879
882
880
void gic_dev_domain_free(struct irq_domain *d, unsigned int virq,