---

yaml --- r: 56613 b: refs/heads/master c: 847f597 h: refs/heads/master i: 56611: ceee624 v: v3
git-mirror · May 17, 2007 · 4e3b564 · 4e3b564
1 parent 70d342e
commit 4e3b564
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c72ea777d4e51435388fbd863c813a19635fa8ef
+refs/heads/master: 847f5976f90d5637a86a826c1c594091d08f3156
diff --git a/trunk/arch/powerpc/kernel/prom.c b/trunk/arch/powerpc/kernel/prom.c
@@ -1472,6 +1472,11 @@ static int of_finish_dynamic_node(struct device_node *node)
 	node->name = of_get_property(node, "name", NULL);
 	node->type = of_get_property(node, "device_type", NULL);
 
+	if (!node->name)
+		node->name = "<NULL>";
+	if (!node->type)
+		node->type = "<NULL>";
+
 	if (!parent) {
 		err = -ENODEV;
 		goto out;