Messages in this thread | | | Date | Sat, 14 Jun 2014 20:42:06 -0700 | From | Frank Rowand <> | Subject | Re: [RFC PATCH] OF: fix of_find_node_by_path() assumption that of_allnodes is root |
| |
On 6/14/2014 8:39 PM, Frank Rowand wrote: > From: Frank Rowand <frank.rowand@sonymobile.com> > > of_find_node_by_path() is borked because of_allnodes is not guaranteed to > contain the root of the tree after using any of the dynamic update functions > because some other nodes ends up as of_allnodes. > > Fixes: c22e650e66b8 of: Make of_find_node_by_path() handle /aliases > Reported-by: pantelis.antoniou@konsulko.com > Signed-off-by: Frank Rowand <frank.rowand@sonymobile.com> > --- > > v2: > Remove change to function header, no longer needed. > Remove BUG_ON(), no longer needed. > Add np as np->parent->allnext instead of np->parent->allnext, as suggested
Aaaargh, cut and paste error, that should be:
Add np as np->parent->allnext instead of of_allnodes->allnext, as suggested
> by Grant Likely. > > > drivers/of/base.c | 4 2 + 2 - 0 ! > 1 file changed, 2 insertions(+), 2 deletions(-) > > Index: b/drivers/of/base.c > =================================================================== > --- a/drivers/of/base.c > +++ b/drivers/of/base.c > @@ -1960,9 +1960,9 @@ int of_attach_node(struct device_node *n > > raw_spin_lock_irqsave(&devtree_lock, flags); > np->sibling = np->parent->child; > - np->allnext = of_allnodes; > + np->allnext = np->parent->allnext; > + np->parent->allnext = np; > np->parent->child = np; > - of_allnodes = np; > of_node_clear_flag(np, OF_DETACHED); > raw_spin_unlock_irqrestore(&devtree_lock, flags); > >
| |