diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-10-14 13:41:57 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-10-14 13:41:57 -0700 |
| commit | c6df33694dbe813e34da1f893cbc08a5822a26d7 (patch) | |
| tree | c73e8332df16575a2a6dedbc0fc8a34b5ddc6587 /drivers/of/address.c | |
| parent | f0b7ed42af0d718fc11d45f6c05948e9a11e08be (diff) | |
| parent | 974070b95b0c8ff6ef0d62109c16aea160cf3c7c (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-androidlsk-v3.10-15.11-androidlsk-v3.10-15.10-android
Diffstat (limited to 'drivers/of/address.c')
| -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 2704df1ad681..d8ea8455a8b1 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -629,10 +629,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); } |