aboutsummaryrefslogtreecommitdiff
path: root/drivers/irqchip/irq-gic-v2m.c
diff options
context:
space:
mode:
authorGravatar Thomas Gleixner <tglx@linutronix.de> 2015-12-19 12:16:20 +0100
committerGravatar Thomas Gleixner <tglx@linutronix.de> 2015-12-19 12:16:20 +0100
commit4e8dbe9e93436bcf326adbab7f9761dd8e4ecbfc (patch)
tree128f3a2a1cc33dddc3a0522185acb48d12c1b6ee /drivers/irqchip/irq-gic-v2m.c
parentMerge branch 'irq/wire-msi-bridge' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentirqchip/gic: Kconfig the number of instances (diff)
downloadlinux-4e8dbe9e93436bcf326adbab7f9761dd8e4ecbfc.tar.gz
linux-4e8dbe9e93436bcf326adbab7f9761dd8e4ecbfc.tar.bz2
linux-4e8dbe9e93436bcf326adbab7f9761dd8e4ecbfc.zip
Merge branch 'irq/gic-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull the GIC related updates from Marc Zyngier: "Not a lot this time (what a relief!), but an interesting series from Linus Walleij coming out of his work converting the ARM RealView platforms to DT, and a couple of mundane fixes."
Diffstat (limited to 'drivers/irqchip/irq-gic-v2m.c')
-rw-r--r--drivers/irqchip/irq-gic-v2m.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c
index 87f8d104acab..ee1e553ee7a6 100644
--- a/drivers/irqchip/irq-gic-v2m.c
+++ b/drivers/irqchip/irq-gic-v2m.c
@@ -389,7 +389,7 @@ int __init gicv2m_of_init(struct device_node *node, struct irq_domain *parent)
ret = gicv2m_init_one(child, parent);
if (ret) {
- of_node_put(node);
+ of_node_put(child);
break;
}
}