diff options
author | Rob Herring <robh@kernel.org> | 2016-03-04 09:56:58 -0500 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2016-03-29 14:29:22 -0400 |
commit | b993734718c0106418e068f21c7be01afc12306c (patch) | |
tree | 8b098809bcc9edb85d0e76c52c1abebd8100440f /scripts/dtc/libfdt/fdt_ro.c | |
parent | f55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff) |
scripts/dtc: Update to upstream version 53bf130b1cdd
Sync to upstream dtc commit 53bf130b1cdd ("libfdt: simplify
fdt_node_check_compatible()"). This adds the following commits from
upstream:
53bf130 libfdt: simplify fdt_node_check_compatible()
c9d9121 Warn on node name unit-address presence/absence mismatch
2e53f9d Catch unsigned 32bit overflow when parsing flattened device tree offsets
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'scripts/dtc/libfdt/fdt_ro.c')
-rw-r--r-- | scripts/dtc/libfdt/fdt_ro.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/dtc/libfdt/fdt_ro.c b/scripts/dtc/libfdt/fdt_ro.c index e5b313682007..50cce864283c 100644 --- a/scripts/dtc/libfdt/fdt_ro.c +++ b/scripts/dtc/libfdt/fdt_ro.c | |||
@@ -647,10 +647,8 @@ int fdt_node_check_compatible(const void *fdt, int nodeoffset, | |||
647 | prop = fdt_getprop(fdt, nodeoffset, "compatible", &len); | 647 | prop = fdt_getprop(fdt, nodeoffset, "compatible", &len); |
648 | if (!prop) | 648 | if (!prop) |
649 | return len; | 649 | return len; |
650 | if (fdt_stringlist_contains(prop, len, compatible)) | 650 | |
651 | return 0; | 651 | return !fdt_stringlist_contains(prop, len, compatible); |
652 | else | ||
653 | return 1; | ||
654 | } | 652 | } |
655 | 653 | ||
656 | int fdt_node_offset_by_compatible(const void *fdt, int startoffset, | 654 | int fdt_node_offset_by_compatible(const void *fdt, int startoffset, |