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

Revert "of: fix of_update_property()"

Browse Source 
This reverts commit 02ed594e7113644c06ae3a89bc9215d839510efc.

The change is completely broken. It attempt to get the previous item in
a linked list by grabbing the address of a stack variable. Outright
wrong.

Signed-off-by: Grant Likely <grant.likely@linaro.org>
This commit is contained in:
Grant Likely 2014-03-04 16:07:17 +08:00
parent f4d4ffc03e
commit a3dbeb5b45
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/of/base.c
View File

@ -1597,7 +1597,7 @@ int of_update_property(struct device_node *np, struct property *newprop)
{ {
struct property **next, *oldprop; struct property **next, *oldprop;
unsigned long flags; unsigned long flags;
int rc = 0; int rc, found = 0;
rc = of_property_notify(OF_RECONFIG_UPDATE_PROPERTY, np, newprop); rc = of_property_notify(OF_RECONFIG_UPDATE_PROPERTY, np, newprop);
if (rc) if (rc)
@ -1606,28 +1606,36 @@ int of_update_property(struct device_node *np, struct property *newprop)
if (!newprop->name) if (!newprop->name)
return -EINVAL; return -EINVAL;
oldprop = of_find_property(np, newprop->name, NULL);
if (!oldprop)
return of_add_property(np, newprop);
raw_spin_lock_irqsave(&devtree_lock, flags); raw_spin_lock_irqsave(&devtree_lock, flags);
oldprop = __of_find_property(np, newprop->name, NULL); next = &np->properties;
if (!oldprop) { while (*next) {
/* add the node */ if (*next == oldprop) {
rc = __of_add_property(np, newprop); /* found the node */
} else { newprop->next = oldprop->next;
/* replace the node */ *next = newprop;
next = &oldprop; oldprop->next = np->deadprops;
newprop->next = oldprop->next; np->deadprops = oldprop;
*next = newprop; found = 1;
oldprop->next = np->deadprops; break;
np->deadprops = oldprop; }
next = &(*next)->next;
} }
raw_spin_unlock_irqrestore(&devtree_lock, flags); raw_spin_unlock_irqrestore(&devtree_lock, flags);
if (!found)
return -ENODEV;
#ifdef CONFIG_PROC_DEVICETREE #ifdef CONFIG_PROC_DEVICETREE
/* try to add to proc as well if it was initialized */ /* try to add to proc as well if it was initialized */
if (!rc && np->pde) if (!rc && np->pde)
proc_device_tree_update_prop(np->pde, newprop, oldprop); proc_device_tree_update_prop(np->pde, newprop, oldprop);
#endif /* CONFIG_PROC_DEVICETREE */ #endif /* CONFIG_PROC_DEVICETREE */
return rc; return 0;
} }
#if defined(CONFIG_OF_DYNAMIC) #if defined(CONFIG_OF_DYNAMIC)