diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-01-05 06:28:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-05 06:28:57 +0000 |
| commit | 13f2d8922efbb7d991956d079b709c0681a7c21a (patch) | |
| tree | de4f284f37773e18eb7a68a4edadac56b895bb7f | |
| parent | b23a6fe0e1c64bcb8071db925eb4162fb400fd06 (diff) | |
| parent | ea682bf4a21b3fa34c4204b228a38f4bf6c7317f (diff) | |
| download | libufdt-13f2d8922efbb7d991956d079b709c0681a7c21a.tar.gz | |
Merge "Fix a test to check duplicated phandles" am: c63cf42770 am: ea682bf4a2
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2321129
Change-Id: I1b596a84e5c66529028faff8dfa9de2a53316d90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/libufdt_verify/ufdt_test_overlay.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/libufdt_verify/ufdt_test_overlay.cpp b/tests/libufdt_verify/ufdt_test_overlay.cpp index 71e888b..603228d 100644 --- a/tests/libufdt_verify/ufdt_test_overlay.cpp +++ b/tests/libufdt_verify/ufdt_test_overlay.cpp @@ -348,7 +348,7 @@ int ufdt_resolve_duplicate_phandles(ufdt** overlay_tree, size_t overlay_count) { if (ufdt_overlay_do_local_fixups(overlay_tree[i], phandle_offset) < 0) { return -1; } - phandle_offset = ufdt_get_max_phandle(overlay_tree[i]); + phandle_offset += ufdt_get_max_phandle(overlay_tree[i]); } return 0; |