[SPARC]: Fix property name acquisition in prom.c
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:
parent
bda2f7b480
commit
f7785a64d1
@ -444,6 +444,7 @@ static struct property * __init build_one_prop(phandle node, char *prev, char *s
|
||||
static struct property *tmp = NULL;
|
||||
struct property *p;
|
||||
int len;
|
||||
const char *name;
|
||||
|
||||
if (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);
|
||||
if (special_name) {
|
||||
strcpy(p->name, special_name);
|
||||
p->length = special_len;
|
||||
p->value = prom_early_alloc(special_len);
|
||||
memcpy(p->value, special_val, special_len);
|
||||
} else {
|
||||
if (prev == NULL) {
|
||||
prom_firstprop(node, p->name);
|
||||
name = prom_firstprop(node, NULL);
|
||||
} else {
|
||||
prom_nextprop(node, prev, p->name);
|
||||
name = prom_nextprop(node, prev, NULL);
|
||||
}
|
||||
if (strlen(p->name) == 0) {
|
||||
if (strlen(name) == 0) {
|
||||
tmp = p;
|
||||
return NULL;
|
||||
}
|
||||
strcpy(p->name, name);
|
||||
p->length = prom_getproplen(node, p->name);
|
||||
if (p->length <= 0) {
|
||||
p->length = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user