From 4e3b564a05f706fe25f68ce742442b7332fbe5cd Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 16 May 2007 16:57:24 +1000
Subject: [PATCH] --- yaml --- r: 56613 b: refs/heads/master c:
 847f5976f90d5637a86a826c1c594091d08f3156 h: refs/heads/master i:   56611:
 ceee6241c25ddc1e3ed6b7439fa80405fb3ef455 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/powerpc/kernel/prom.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1c7ccfdf22a2..dff9cffd2b37 100644
--- 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
index c065b5550368..066a6a7a25b8 100644
--- 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;