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/cpm2_pic.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/cpm2_pic.c')
-rw-r--r-- | arch/powerpc/sysdev/cpm2_pic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c index 5fe65b2f8f3a..b16ca3ed65d2 100644 --- a/arch/powerpc/sysdev/cpm2_pic.c +++ b/arch/powerpc/sysdev/cpm2_pic.c | |||
@@ -266,7 +266,7 @@ void cpm2_pic_init(struct device_node *node) | |||
266 | out_be32(&cpm2_intctl->ic_scprrl, 0x05309770); | 266 | out_be32(&cpm2_intctl->ic_scprrl, 0x05309770); |
267 | 267 | ||
268 | /* create a legacy host */ | 268 | /* create a legacy host */ |
269 | cpm2_pic_host = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LINEAR, | 269 | cpm2_pic_host = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR, |
270 | 64, &cpm2_pic_host_ops, 64); | 270 | 64, &cpm2_pic_host_ops, 64); |
271 | if (cpm2_pic_host == NULL) { | 271 | if (cpm2_pic_host == NULL) { |
272 | printk(KERN_ERR "CPM2 PIC: failed to allocate irq host!\n"); | 272 | printk(KERN_ERR "CPM2 PIC: failed to allocate irq host!\n"); |