---

yaml --- r: 60682 b: refs/heads/master c: 972d17c h: refs/heads/master v: v3
git-mirror · Jul 10, 2007 · fc48227 · fc48227
1 parent 5c4a099
commit fc48227
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 333e615483afc5203d1cae1490e50982d6eefbea
+refs/heads/master: 972d17c9dbad378da61baa17f4c3ea6e154b186a
diff --git a/trunk/arch/powerpc/kernel/prom.c b/trunk/arch/powerpc/kernel/prom.c
@@ -1432,6 +1432,8 @@ void of_detach_node(const struct device_node *np)
 	write_lock(&devtree_lock);
 
 	parent = np->parent;
+	if (!parent)
+		goto out_unlock;
 
 	if (allnodes == np)
 		allnodes = np->allnext;
@@ -1455,6 +1457,7 @@ void of_detach_node(const struct device_node *np)
 		prevsib->sibling = np->sibling;
 	}
 
+out_unlock:
 	write_unlock(&devtree_lock);
 }