Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=29e931...
Commit:     29e931c02b0e54f3d36b930c118e69b507b4b6ff
Parent:     1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a
Author:     Nicolas Palix <npalix@diku.dk>
AuthorDate: Tue Dec 2 03:34:46 2008 +0000
Committer:  Paul Mackerras <paulus@samba.org>
CommitDate: Tue Dec 16 14:39:32 2008 +1100

    powerpc/chrp: Add missing of_node_put in pci.c
    
    of_node_put is needed before discarding a value received from
    of_find_node_by_name, eg in error handling code or when the device
    node is no longer used.
    
    The semantic match that catches the bug is as follows:
    (http://www.emn.fr/x-info/coccinelle/)
    
    // <smpl>
    @r exists@
    local idexpression struct device_node *n;
    position p1, p2;
    statement S1,S2;
    expression E,E1;
    expression *ptr != NULL;
    @@
    
    (
    if (!(n@p1 = of_find_node_by_name(...))) S1
    |
    n@p1 = of_find_node_by_name(...)
    )
    <... when != of_node_put(n)
        when != if (...) { <+... of_node_put(n) ...+> }
        when != true !n  || ...
        when != n = E
        when != E = n
    if (!n || ...) S2
    ...>
    (
      return \(0\|<+...n...+>\|ptr\);
    |
    return@p2 ...;
    |
    n = E1
    |
    E1 = n
    )
    @script:python@
    p1 << r.p1;
    p2 << r.p2;
    @@
    
    print "* file: %s of_find_node_by_name %s return %s" % (p1[0].file,p1[0].line,p2[0].line)
    // </smpl>
    
    Signed-off-by: Nicolas Palix <npalix@diku.dk>
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
---
 arch/powerpc/platforms/chrp/pci.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
index d3cde6b..5a72ee5 100644
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -141,6 +141,7 @@ hydra_init(void)
 		of_node_put(np);
 		return 0;
 	}
+	of_node_put(np);
 	Hydra = ioremap(r.start, r.end-r.start);
 	printk("Hydra Mac I/O at %llx\n", (unsigned long long)r.start);
 	printk("Hydra Feature_Control was %x",
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html