diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2008-05-25 22:12:32 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-06-08 23:51:16 -0400 |
commit | 19fc65b5251dfd90312ae0142cc8650cd273e6a6 (patch) | |
tree | 2b61ab4405dce8bd17e76584821856ea3baabd88 /arch/powerpc/sysdev/mpic.c | |
parent | 2272a55f16c998d916904bba018b0f40f430d744 (diff) |
powerpc: Fix irq_alloc_host() reference counting and callers
When I changed irq_alloc_host() to take an of_node
(52964f87c64e6c6ea671b5bf3030fb1494090a48: "Add an optional
device_node pointer to the irq_host"), I botched the reference
counting semantics.
Stephen pointed out that it's irq_alloc_host()'s business if
it needs to take an additional reference to the device_node,
the caller shouldn't need to care.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/sysdev/mpic.c')
-rw-r--r-- | arch/powerpc/sysdev/mpic.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index a281341e4129..5788a6ab1254 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
@@ -1016,13 +1016,11 @@ struct mpic * __init mpic_alloc(struct device_node *node, | |||
1016 | memset(mpic, 0, sizeof(struct mpic)); | 1016 | memset(mpic, 0, sizeof(struct mpic)); |
1017 | mpic->name = name; | 1017 | mpic->name = name; |
1018 | 1018 | ||
1019 | mpic->irqhost = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LINEAR, | 1019 | mpic->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR, |
1020 | isu_size, &mpic_host_ops, | 1020 | isu_size, &mpic_host_ops, |
1021 | flags & MPIC_LARGE_VECTORS ? 2048 : 256); | 1021 | flags & MPIC_LARGE_VECTORS ? 2048 : 256); |
1022 | if (mpic->irqhost == NULL) { | 1022 | if (mpic->irqhost == NULL) |
1023 | of_node_put(node); | ||
1024 | return NULL; | 1023 | return NULL; |
1025 | } | ||
1026 | 1024 | ||
1027 | mpic->irqhost->host_data = mpic; | 1025 | mpic->irqhost->host_data = mpic; |
1028 | mpic->hc_irq = mpic_irq_chip; | 1026 | mpic->hc_irq = mpic_irq_chip; |