leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SPARC]: Fix property name acquisition in prom.c

Browse Source 
On sparc32 the prom_{first,next}prop() interfaces work
a little differently.  The buffer argument is ignored on
sparc32 and the firmware just returns a raw pointer to
the property name.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Bob Breuer 2006-07-17 17:05:56 -07:00 committed by David S. Miller
parent bda2f7b480
commit f7785a64d1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/sparc/kernel/prom.c
View File

@ -444,6 +444,7 @@ static struct property * __init build_one_prop(phandle node, char *prev, char *s
static struct property *tmp = NULL; static struct property *tmp = NULL;
struct property *p; struct property *p;
int len; int len;
const char *name;
if (tmp) { if (tmp) {
p = tmp; p = tmp;
@ -456,19 +457,21 @@ static struct property * __init build_one_prop(phandle node, char *prev, char *s
p->name = (char *) (p + 1); p->name = (char *) (p + 1);
if (special_name) { if (special_name) {
strcpy(p->name, special_name);
p->length = special_len; p->length = special_len;
p->value = prom_early_alloc(special_len); p->value = prom_early_alloc(special_len);
memcpy(p->value, special_val, special_len); memcpy(p->value, special_val, special_len);
} else { } else {
if (prev == NULL) { if (prev == NULL) {
prom_firstprop(node, p->name); name = prom_firstprop(node, NULL);
} else { } else {
prom_nextprop(node, prev, p->name); name = prom_nextprop(node, prev, NULL);
} }
if (strlen(p->name) == 0) { if (strlen(name) == 0) {
tmp = p; tmp = p;
return NULL; return NULL;
} }
strcpy(p->name, name);
p->length = prom_getproplen(node, p->name); p->length = prom_getproplen(node, p->name);
if (p->length <= 0) { if (p->length <= 0) {
p->length = 0; p->length = 0;