@@ -1530,6 +1530,21 @@ int of_count_phandle_with_args(const struct device_node *np, const char *list_na
}
EXPORT_SYMBOL(of_count_phandle_with_args);
+static void __of_remove_dead_property(struct device_node *np, struct property *prop)
+{
+ struct property **next;
+
+ /* If the property is in deadprops then it must be removed */
+ for (next = &np->deadprops; *next; next = &(*next)->next) {
+ if (*next != prop)
+ continue;
+
+ *next = prop->next;
+ prop->next = NULL;
+ break;
+ }
+}
+
/**
* __of_add_property - Add a property to a node without lock operations
* @np: Caller's Device Node
@@ -1539,6 +1554,8 @@ int __of_add_property(struct device_node *np, struct property *prop)
{
struct property **next;
+ __of_remove_dead_property(np, prop);
+
prop->next = NULL;
next = &np->properties;
while (*next) {
@@ -1641,6 +1658,8 @@ int __of_update_property(struct device_node *np, struct property *newprop,
{
struct property **next, *oldprop;
+ __of_remove_dead_property(np, newprop);
+
for (next = &np->properties; *next; next = &(*next)->next) {
if (of_prop_cmp((*next)->name, newprop->name) == 0)
break;
@@ -563,7 +563,6 @@ static int __of_changeset_entry_notify(struct of_changeset_entry *ce,
static int __of_changeset_entry_apply(struct of_changeset_entry *ce)
{
- struct property **propp;
unsigned long flags;
int ret = 0;
@@ -578,15 +577,6 @@ static int __of_changeset_entry_apply(struct of_changeset_entry *ce)
__of_detach_node(ce->np);
break;
case OF_RECONFIG_ADD_PROPERTY:
- /* If the property is in deadprops then it must be removed */
- for (propp = &ce->np->deadprops; *propp; propp = &(*propp)->next) {
- if (*propp == ce->prop) {
- *propp = ce->prop->next;
- ce->prop->next = NULL;
- break;
- }
- }
-
ret = __of_add_property(ce->np, ce->prop);
break;
case OF_RECONFIG_REMOVE_PROPERTY:
@@ -594,15 +584,6 @@ static int __of_changeset_entry_apply(struct of_changeset_entry *ce)
break;
case OF_RECONFIG_UPDATE_PROPERTY:
- /* If the property is in deadprops then it must be removed */
- for (propp = &ce->np->deadprops; *propp; propp = &(*propp)->next) {
- if (*propp == ce->prop) {
- *propp = ce->prop->next;
- ce->prop->next = NULL;
- break;
- }
- }
-
ret = __of_update_property(ce->np, ce->prop, &ce->old_prop);
break;
default:
The changeset code checks for a property in the deadprops list when adding/updating a property, but of_add_property() and of_update_property() do not. As the users of these functions are pretty simple, they have not hit this scenario or else the property lists would get corrupted. Signed-off-by: Rob Herring <robh@kernel.org> --- v2: - Add helper to remove property from deadprops list --- drivers/of/base.c | 19 +++++++++++++++++++ drivers/of/dynamic.c | 19 ------------------- 2 files changed, 19 insertions(+), 19 deletions(-)