diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-24 02:22:43 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-24 02:22:43 (GMT) |
| commit | d5c1d8c567781932e3ab2c62e8fcfee0283d9580 (patch) | |
| tree | c04fca1719409426b42af6a7caa75cc26ba940a9 /drivers/of/unittest.c | |
| parent | ba7c95ea3870fe7b847466d39a049ab6f156aa2c (diff) | |
| parent | 90a5a895cc8b284ac522757a01de15e36710c2b9 (diff) | |
| download | linux-d5c1d8c567781932e3ab2c62e8fcfee0283d9580.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/netfilter/nf_tables_core.c
The nf_tables_core.c conflict was resolved using a conflict resolution
from Stephen Rothwell as a guide.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/of/unittest.c')
| -rw-r--r-- | drivers/of/unittest.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index aba8946..52c45c7 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -97,6 +97,11 @@ static void __init of_selftest_find_node_by_name(void) "option path test, subcase #1 failed\n"); of_node_put(np); + np = of_find_node_opts_by_path("/testcase-data/testcase-device1:test/option", &options); + selftest(np && !strcmp("test/option", options), + "option path test, subcase #2 failed\n"); + of_node_put(np); + np = of_find_node_opts_by_path("/testcase-data:testoption", NULL); selftest(np, "NULL option path test failed\n"); of_node_put(np); |