diff options
author | Nathan Lynch <ntl@pobox.com> | 2007-01-02 17:37:06 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-01-09 01:03:01 -0500 |
commit | 5e264a5215e4b703b1bbeb2910ea4441886be8d7 (patch) | |
tree | d77db6c86355cc91d4a6373f55af57e9e63c0dad | |
parent | 6aa3e1e9447134ccda8b04b91c4ba8182274a78e (diff) |
[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 f12d5c69e74d..50855d4fd5a0 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) | |||
254 | printk(KERN_DEBUG "OpenPIC addr: %lx, has ISUs: %d\n", | 254 | printk(KERN_DEBUG "OpenPIC addr: %lx, has ISUs: %d\n", |
255 | openpic_addr, has_isus); | 255 | openpic_addr, has_isus); |
256 | } | 256 | } |
257 | of_node_put(root); | ||
258 | 257 | ||
259 | BUG_ON(openpic_addr == 0); | 258 | BUG_ON(openpic_addr == 0); |
260 | 259 | ||
diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c index 89d6e295dbf7..bea7d1bb1a3b 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) | |||
129 | } | 129 | } |
130 | openpic_addr = of_read_number(opprop, naddr); | 130 | openpic_addr = of_read_number(opprop, naddr); |
131 | printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr); | 131 | printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr); |
132 | of_node_put(root); | ||
133 | 132 | ||
134 | mpic = mpic_alloc(mpic_node, openpic_addr, MPIC_PRIMARY, 0, 0, | 133 | mpic = mpic_alloc(mpic_node, openpic_addr, MPIC_PRIMARY, 0, 0, |
135 | " PAS-OPIC "); | 134 | " PAS-OPIC "); |