aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/sysdev/uic.c
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2008-05-25 22:12:32 -0400
committerPaul Mackerras <paulus@samba.org>2008-06-08 23:51:16 -0400
commit19fc65b5251dfd90312ae0142cc8650cd273e6a6 (patch)
tree2b61ab4405dce8bd17e76584821856ea3baabd88 /arch/powerpc/sysdev/uic.c
parent2272a55f16c998d916904bba018b0f40f430d744 (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/uic.c')
-rw-r--r--arch/powerpc/sysdev/uic.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c
index 625b275c3795..d35405c59434 100644
--- a/arch/powerpc/sysdev/uic.c
+++ b/arch/powerpc/sysdev/uic.c
@@ -280,12 +280,10 @@ static struct uic * __init uic_init_one(struct device_node *node)
280 } 280 }
281 uic->dcrbase = *dcrreg; 281 uic->dcrbase = *dcrreg;
282 282
283 uic->irqhost = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LINEAR, 283 uic->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR,
284 NR_UIC_INTS, &uic_host_ops, -1); 284 NR_UIC_INTS, &uic_host_ops, -1);
285 if (! uic->irqhost) { 285 if (! uic->irqhost)
286 of_node_put(node);
287 return NULL; /* FIXME: panic? */ 286 return NULL; /* FIXME: panic? */
288 }
289 287
290 uic->irqhost->host_data = uic; 288 uic->irqhost->host_data = uic;
291 289