summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-12-29 10:08:45 +0100
committerThomas Gleixner <tglx@linutronix.de>2015-12-29 10:08:45 +0100
commit92b86f92ed0307efbaea3c0e95520551848d3995 (patch)
tree20db0701571353b7e20a9417516616b4b60ebffa /kernel
parentgenirq/msi: Export functions to allow MSI domains in modules (diff)
parentirqchip/gic-v2m: acpi: Introducing GICv2m ACPI support (diff)
downloadlinux-92b86f92ed0307efbaea3c0e95520551848d3995.tar.xz
linux-92b86f92ed0307efbaea3c0e95520551848d3995.zip
Merge branch 'irq/gic-v2m-acpi' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull another round of GIC changes from Marc: ACPI support for GIV-v2m
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq/irqdomain.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 280a7fc43dd1..8cf95de1ab3f 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -71,7 +71,7 @@ void irq_domain_free_fwnode(struct fwnode_handle *fwnode)
{
struct irqchip_fwid *fwid;
- if (WARN_ON(fwnode->type != FWNODE_IRQCHIP))
+ if (WARN_ON(!is_fwnode_irqchip(fwnode)))
return;
fwid = container_of(fwnode, struct irqchip_fwid, fwnode);