| Message ID | 1358619642-23607-1-git-send-email-thomas.abraham@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 19 January 2013 10:20, Thomas Abraham <thomas.abraham@linaro.org> wrote: > The of_find_matching_node_and_match() function incorrectly sets the matched > entry to 'matches' when the compatible value of a node matches one of the > possible values. This results in incorrectly selecting the the first entry in > the 'matches' list as the matched entry. Fix this by noting down the result of > the call to of_match_node() and setting that as the matched entry. > > Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> > --- > drivers/of/base.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) [Adding devicetree-discuss@lists.ozlabs.org to the cc list] > > diff --git a/drivers/of/base.c b/drivers/of/base.c > index 2390ddb..960ae5b 100644 > --- a/drivers/of/base.c > +++ b/drivers/of/base.c > @@ -612,6 +612,7 @@ struct device_node *of_find_matching_node_and_match(struct device_node *from, > const struct of_device_id **match) > { > struct device_node *np; > + const struct of_device_id *m; > > if (match) > *match = NULL; > @@ -619,9 +620,10 @@ struct device_node *of_find_matching_node_and_match(struct device_node *from, > read_lock(&devtree_lock); > np = from ? from->allnext : of_allnodes; > for (; np; np = np->allnext) { > - if (of_match_node(matches, np) && of_node_get(np)) { > + m = of_match_node(matches, np); > + if (m && of_node_get(np)) { > if (match) > - *match = matches; > + *match = m; > break; > } > } > -- > 1.7.5.4 >
On 01/19/2013 12:20 PM, Thomas Abraham wrote: > The of_find_matching_node_and_match() function incorrectly sets the matched > entry to 'matches' when the compatible value of a node matches one of the > possible values. This results in incorrectly selecting the the first entry in > the 'matches' list as the matched entry. Fix this by noting down the result of > the call to of_match_node() and setting that as the matched entry. Looks fine, but is this breaking something in 3.8 or can it wait for 3.9? Rob > > Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> > --- > drivers/of/base.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/of/base.c b/drivers/of/base.c > index 2390ddb..960ae5b 100644 > --- a/drivers/of/base.c > +++ b/drivers/of/base.c > @@ -612,6 +612,7 @@ struct device_node *of_find_matching_node_and_match(struct device_node *from, > const struct of_device_id **match) > { > struct device_node *np; > + const struct of_device_id *m; > > if (match) > *match = NULL; > @@ -619,9 +620,10 @@ struct device_node *of_find_matching_node_and_match(struct device_node *from, > read_lock(&devtree_lock); > np = from ? from->allnext : of_allnodes; > for (; np; np = np->allnext) { > - if (of_match_node(matches, np) && of_node_get(np)) { > + m = of_match_node(matches, np); > + if (m && of_node_get(np)) { > if (match) > - *match = matches; > + *match = m; > break; > } > } >
On 20 January 2013 13:50, Rob Herring <robherring2@gmail.com> wrote: > On 01/19/2013 12:20 PM, Thomas Abraham wrote: >> The of_find_matching_node_and_match() function incorrectly sets the matched >> entry to 'matches' when the compatible value of a node matches one of the >> possible values. This results in incorrectly selecting the the first entry in >> the 'matches' list as the matched entry. Fix this by noting down the result of >> the call to of_match_node() and setting that as the matched entry. > > Looks fine, but is this breaking something in 3.8 or can it wait for 3.9? Yes, it can wait for 3.9. I am using this function while adding device tree support for timers on exynos platform which will probably merged in 3.9. Thanks, Thomas. > > Rob > >> >> Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> >> --- >> drivers/of/base.c | 6 ++++-- >> 1 files changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/of/base.c b/drivers/of/base.c >> index 2390ddb..960ae5b 100644 >> --- a/drivers/of/base.c >> +++ b/drivers/of/base.c >> @@ -612,6 +612,7 @@ struct device_node *of_find_matching_node_and_match(struct device_node *from, >> const struct of_device_id **match) >> { >> struct device_node *np; >> + const struct of_device_id *m; >> >> if (match) >> *match = NULL; >> @@ -619,9 +620,10 @@ struct device_node *of_find_matching_node_and_match(struct device_node *from, >> read_lock(&devtree_lock); >> np = from ? from->allnext : of_allnodes; >> for (; np; np = np->allnext) { >> - if (of_match_node(matches, np) && of_node_get(np)) { >> + m = of_match_node(matches, np); >> + if (m && of_node_get(np)) { >> if (match) >> - *match = matches; >> + *match = m; >> break; >> } >> } >>
On 01/20/2013 03:56 PM, Thomas Abraham wrote: > On 20 January 2013 13:50, Rob Herring <robherring2@gmail.com> wrote: >> On 01/19/2013 12:20 PM, Thomas Abraham wrote: >>> The of_find_matching_node_and_match() function incorrectly sets the matched >>> entry to 'matches' when the compatible value of a node matches one of the >>> possible values. This results in incorrectly selecting the the first entry in >>> the 'matches' list as the matched entry. Fix this by noting down the result of >>> the call to of_match_node() and setting that as the matched entry. >> >> Looks fine, but is this breaking something in 3.8 or can it wait for 3.9? > > Yes, it can wait for 3.9. I am using this function while adding device > tree support for timers on exynos platform which will probably merged > in 3.9. Applied for 3.9. It's in my for-next branch on sources.calxeda.com. This is a stable branch. Rob > > Thanks, > Thomas. > >> >> Rob >> >>> >>> Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> >>> --- >>> drivers/of/base.c | 6 ++++-- >>> 1 files changed, 4 insertions(+), 2 deletions(-) >>> >>> diff --git a/drivers/of/base.c b/drivers/of/base.c >>> index 2390ddb..960ae5b 100644 >>> --- a/drivers/of/base.c >>> +++ b/drivers/of/base.c >>> @@ -612,6 +612,7 @@ struct device_node *of_find_matching_node_and_match(struct device_node *from, >>> const struct of_device_id **match) >>> { >>> struct device_node *np; >>> + const struct of_device_id *m; >>> >>> if (match) >>> *match = NULL; >>> @@ -619,9 +620,10 @@ struct device_node *of_find_matching_node_and_match(struct device_node *from, >>> read_lock(&devtree_lock); >>> np = from ? from->allnext : of_allnodes; >>> for (; np; np = np->allnext) { >>> - if (of_match_node(matches, np) && of_node_get(np)) { >>> + m = of_match_node(matches, np); >>> + if (m && of_node_get(np)) { >>> if (match) >>> - *match = matches; >>> + *match = m; >>> break; >>> } >>> } >>>
On 20 January 2013 19:27, Rob Herring <robherring2@gmail.com> wrote: > On 01/20/2013 03:56 PM, Thomas Abraham wrote: >> On 20 January 2013 13:50, Rob Herring <robherring2@gmail.com> wrote: >>> On 01/19/2013 12:20 PM, Thomas Abraham wrote: >>>> The of_find_matching_node_and_match() function incorrectly sets the matched >>>> entry to 'matches' when the compatible value of a node matches one of the >>>> possible values. This results in incorrectly selecting the the first entry in >>>> the 'matches' list as the matched entry. Fix this by noting down the result of >>>> the call to of_match_node() and setting that as the matched entry. >>> >>> Looks fine, but is this breaking something in 3.8 or can it wait for 3.9? >> >> Yes, it can wait for 3.9. I am using this function while adding device >> tree support for timers on exynos platform which will probably merged >> in 3.9. > > Applied for 3.9. It's in my for-next branch on sources.calxeda.com. This > is a stable branch. > > Rob Thank you Rob. Regards, Thomas.
diff --git a/drivers/of/base.c b/drivers/of/base.c index 2390ddb..960ae5b 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -612,6 +612,7 @@ struct device_node *of_find_matching_node_and_match(struct device_node *from, const struct of_device_id **match) { struct device_node *np; + const struct of_device_id *m; if (match) *match = NULL; @@ -619,9 +620,10 @@ struct device_node *of_find_matching_node_and_match(struct device_node *from, read_lock(&devtree_lock); np = from ? from->allnext : of_allnodes; for (; np; np = np->allnext) { - if (of_match_node(matches, np) && of_node_get(np)) { + m = of_match_node(matches, np); + if (m && of_node_get(np)) { if (match) - *match = matches; + *match = m; break; } }
The of_find_matching_node_and_match() function incorrectly sets the matched entry to 'matches' when the compatible value of a node matches one of the possible values. This results in incorrectly selecting the the first entry in the 'matches' list as the matched entry. Fix this by noting down the result of the call to of_match_node() and setting that as the matched entry. Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> --- drivers/of/base.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)