diff options
| author | David Daney <david.daney@cavium.com> | 2015-08-19 13:17:47 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-10-13 03:46:06 +0100 |
| commit | 3ccc6060445dbc7ee6d139102e8fbca362a23a93 (patch) | |
| tree | 18c3a47794fb1f0277ad678e9283df5079d71f18 | |
| parent | e2aebb820458a5cb66f3c7fd10134b976a092a70 (diff) | |
| download | kernel_samsung_smdk4412-3ccc6060445dbc7ee6d139102e8fbca362a23a93.zip kernel_samsung_smdk4412-3ccc6060445dbc7ee6d139102e8fbca362a23a93.tar.gz kernel_samsung_smdk4412-3ccc6060445dbc7ee6d139102e8fbca362a23a93.tar.bz2 | |
of/address: Don't loop forever in of_find_matching_node_by_address().
commit 3a496b00b6f90c41bd21a410871dfc97d4f3c7ab upstream.
If the internal call to of_address_to_resource() fails, we end up
looping forever in of_find_matching_node_by_address(). This can be
caused by a defective device tree, or calling with an incorrect
matches argument.
Fix by calling of_find_matching_node() unconditionally at the end of
the loop.
Signed-off-by: David Daney <david.daney@cavium.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/of/address.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c index 53a613f..39016a0 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -604,10 +604,10 @@ struct device_node *of_find_matching_node_by_address(struct device_node *from, struct resource res; while (dn) { - if (of_address_to_resource(dn, 0, &res)) - continue; - if (res.start == base_address) + if (!of_address_to_resource(dn, 0, &res) && + res.start == base_address) return dn; + dn = of_find_matching_node(dn, matches); } |