of/address: Don't loop forever in of_find_matching_node_by_address().

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>
Cc: stable@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 8bfda6ade2c0..384574c3987c 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -845,10 +845,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);
         }