summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/sysdev/cpm1.c
diff options
context:
space:
mode:
authorMichael Ellerman2008-05-26 04:12:32 +0200
committerPaul Mackerras2008-06-09 05:51:16 +0200
commit19fc65b5251dfd90312ae0142cc8650cd273e6a6 (patch)
tree2b61ab4405dce8bd17e76584821856ea3baabd88 /arch/powerpc/sysdev/cpm1.c
parentpowerpc: Rework qe_ic_init() so we can avoid freeing the irq_host (diff)
downloadkernel-qcow2-linux-19fc65b5251dfd90312ae0142cc8650cd273e6a6.tar.gz
kernel-qcow2-linux-19fc65b5251dfd90312ae0142cc8650cd273e6a6.tar.xz
kernel-qcow2-linux-19fc65b5251dfd90312ae0142cc8650cd273e6a6.zip
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/cpm1.c')
-rw-r--r--arch/powerpc/sysdev/cpm1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c
index 58292a086c16..661df42830b9 100644
--- a/arch/powerpc/sysdev/cpm1.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -159,7 +159,7 @@ unsigned int cpm_pic_init(void)
out_be32(&cpic_reg->cpic_cimr, 0);
- cpm_pic_host = irq_alloc_host(of_node_get(np), IRQ_HOST_MAP_LINEAR,
+ cpm_pic_host = irq_alloc_host(np, IRQ_HOST_MAP_LINEAR,
64, &cpm_pic_host_ops, 64);
if (cpm_pic_host == NULL) {
printk(KERN_ERR "CPM2 PIC: failed to allocate irq host!\n");