From 514a40db2d9318345788b3737174184f142c1e1d Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 5 Dec 2008 17:06:47 -0800
Subject: [PATCH] --- yaml --- r: 123371 b: refs/heads/master c:
 59966e3b4e9e6573b352301ad0ceed15196d4e2d h: refs/heads/master i:   123369:
 c70d619110ba5a9ebb5ab0b4fc9c0be53ffd5432   123367:
 e6ed837d6bab6d5dee77fc8ef4fbddaab2e20ca4 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/sparc/kernel/prom_32.c | 2 +-
 trunk/arch/sparc/kernel/prom_64.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cb34b80e515e..7526dec895eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9e5567cda6387e0f4061bfceebbc1bd63ee42a6
+refs/heads/master: 59966e3b4e9e6573b352301ad0ceed15196d4e2d
diff --git a/trunk/arch/sparc/kernel/prom_32.c b/trunk/arch/sparc/kernel/prom_32.c
index a9859d2b2565..a6809bc9ab9d 100644
--- a/trunk/arch/sparc/kernel/prom_32.c
+++ b/trunk/arch/sparc/kernel/prom_32.c
@@ -196,7 +196,7 @@ static char * __init build_full_name(struct device_node *dp)
 	return n;
 }
 
-static char * __init get_one_property(phandle node, char *name)
+static char * __init get_one_property(phandle node, const char *name)
 {
 	char *buf = "<NULL>";
 	int len;
diff --git a/trunk/arch/sparc/kernel/prom_64.c b/trunk/arch/sparc/kernel/prom_64.c
index e3969db4d58b..ce96c1cf6c3a 100644
--- a/trunk/arch/sparc/kernel/prom_64.c
+++ b/trunk/arch/sparc/kernel/prom_64.c
@@ -407,7 +407,7 @@ static char * __init get_one_property(phandle node, const char *name)
 	len = prom_getproplen(node, name);
 	if (len > 0) {
 		buf = prom_early_alloc(len);
-		prom_getproperty(node, name, buf, len);
+		len = prom_getproperty(node, name, buf, len);
 	}
 
 	return buf;