powerpc/powermac: Add missing of_node_put
authorJulia Lawall <julia@diku.dk>
Sun, 21 Aug 2011 06:10:01 +0000 (06:10 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 25 Nov 2011 03:11:27 +0000 (14:11 +1100)
np is initialized to the result of calling a function that calls
of_node_get, so of_node_put should be called before the pointer is dropped.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression e,e1,e2;
@@

* e = \(of_find_node_by_type\|of_find_node_by_name\)(...)
  ... when != of_node_put(e)
      when != true e == NULL
      when != e2 = e
  e = e1
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/platforms/powermac/setup.c

index 96580b189ec21446f6b6240aea32effc9b571aad..970ea1de4298c0cf0a1166974352aa61d03286dd 100644 (file)
@@ -494,11 +494,15 @@ static int __init pmac_declare_of_platform_devices(void)
                return -1;
 
        np = of_find_node_by_name(NULL, "valkyrie");
-       if (np)
+       if (np) {
                of_platform_device_create(np, "valkyrie", NULL);
+               of_node_put(np);
+       }
        np = of_find_node_by_name(NULL, "platinum");
-       if (np)
+       if (np) {
                of_platform_device_create(np, "platinum", NULL);
+               of_node_put(np);
+       }
         np = of_find_node_by_type(NULL, "smu");
         if (np) {
                of_platform_device_create(np, "smu", NULL);