Browse Source

powerpc/powermac: Add missing of_node_put

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>
Julia Lawall 14 years ago
parent
commit
3631cb83dd
1 changed files with 6 additions and 2 deletions
  1. 6 2
      arch/powerpc/platforms/powermac/setup.c

+ 6 - 2
arch/powerpc/platforms/powermac/setup.c

@@ -494,11 +494,15 @@ static int __init pmac_declare_of_platform_devices(void)
 		return -1;
 		return -1;
 
 
 	np = of_find_node_by_name(NULL, "valkyrie");
 	np = of_find_node_by_name(NULL, "valkyrie");
-	if (np)
+	if (np) {
 		of_platform_device_create(np, "valkyrie", NULL);
 		of_platform_device_create(np, "valkyrie", NULL);
+		of_node_put(np);
+	}
 	np = of_find_node_by_name(NULL, "platinum");
 	np = of_find_node_by_name(NULL, "platinum");
-	if (np)
+	if (np) {
 		of_platform_device_create(np, "platinum", NULL);
 		of_platform_device_create(np, "platinum", NULL);
+		of_node_put(np);
+	}
         np = of_find_node_by_type(NULL, "smu");
         np = of_find_node_by_type(NULL, "smu");
         if (np) {
         if (np) {
 		of_platform_device_create(np, "smu", NULL);
 		of_platform_device_create(np, "smu", NULL);