diff options
author | Nathan Lynch <ntl@pobox.com> | 2007-01-02 16:37:06 -0600 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-01-09 17:03:01 +1100 |
commit | 5e264a5215e4b703b1bbeb2910ea4441886be8d7 (patch) | |
tree | d77db6c86355cc91d4a6373f55af57e9e63c0dad | |
parent | 6aa3e1e9447134ccda8b04b91c4ba8182274a78e (diff) | |
download | op-kernel-dev-5e264a5215e4b703b1bbeb2910ea4441886be8d7.zip op-kernel-dev-5e264a5215e4b703b1bbeb2910ea4441886be8d7.tar.gz |
[POWERPC] Fix unbalanced uses of of_node_put
The (maple|pasemi)_init_IRQ functions call of_node_put(root) once more
than they should, causing the refcount of the root node to underflow,
which triggers the WARN_ON in kref_get.
Signed-off-by: Nathan Lynch <ntl@pobox.com>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/platforms/maple/setup.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/pasemi/setup.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c index f12d5c6..50855d4 100644 --- a/arch/powerpc/platforms/maple/setup.c +++ b/arch/powerpc/platforms/maple/setup.c @@ -254,7 +254,6 @@ static void __init maple_init_IRQ(void) printk(KERN_DEBUG "OpenPIC addr: %lx, has ISUs: %d\n", openpic_addr, has_isus); } - of_node_put(root); BUG_ON(openpic_addr == 0); diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c index 89d6e29..bea7d1b 100644 --- a/arch/powerpc/platforms/pasemi/setup.c +++ b/arch/powerpc/platforms/pasemi/setup.c @@ -129,7 +129,6 @@ static __init void pas_init_IRQ(void) } openpic_addr = of_read_number(opprop, naddr); printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr); - of_node_put(root); mpic = mpic_alloc(mpic_node, openpic_addr, MPIC_PRIMARY, 0, 0, " PAS-OPIC "); |