diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-11-19 17:13:44 +0000 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-11-20 15:32:49 +0000 |
| commit | 788ec2fc2ca295a2d929986e95231214ecd8d142 (patch) | |
| tree | 17f8d173bf4482bbdde8b7ce9c30d5a10ac033f5 /drivers/of | |
| parent | c1a2086e2d8c4eb4e8630ba752e911ec180dec67 (diff) | |
of/selftest: Fix testing when /aliases is missingdevicetree-fixes-for-3.18
The /aliases node isn't always present in the device tree, but the
unittest code assumes that /aliases is there. Add a check when inserting
the testcase data to see if of_aliases needs to be updated, and undo the
settings when the nodes are removed.
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Gaurav Minocha <gaurav.minocha.os@gmail.com>
Cc: <stable@vger.kernel.org>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/selftest.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/of/selftest.c b/drivers/of/selftest.c index e6c14dc400e9..e2d79afa9dc6 100644 --- a/drivers/of/selftest.c +++ b/drivers/of/selftest.c @@ -899,7 +899,11 @@ static void selftest_data_remove(void) while (last_node_index-- > 0) { if (nodes[last_node_index]) { np = of_find_node_by_path(nodes[last_node_index]->full_name); - if (strcmp(np->full_name, "/aliases") != 0) { + if (np == nodes[last_node_index]) { + if (of_aliases == np) { + of_node_put(of_aliases); + of_aliases = NULL; + } detach_node_and_children(np); } else { for_each_property_of_node(np, prop) { @@ -920,6 +924,8 @@ static int __init of_selftest(void) res = selftest_data_add(); if (res) return res; + if (!of_aliases) + of_aliases = of_find_node_by_path("/aliases"); np = of_find_node_by_path("/testcase-data/phandle-tests/consumer-a"); if (!np) { |