diff options
| author | Simon Glass <sjg@chromium.org> | 2020-06-15 10:00:33 -0600 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2020-06-16 13:12:43 +1000 |
| commit | 7be250b4d059771c47be00ec8d4df7f47e4ac77c (patch) | |
| tree | d3d30a30c07da3506f7cdcf53499e00245c763fd /libfdt/fdt_rw.c | |
| parent | 81e0919a3e211844245a3c19be28610f930c13c0 (diff) | |
| download | dtc-7be250b4d059771c47be00ec8d4df7f47e4ac77c.zip dtc-7be250b4d059771c47be00ec8d4df7f47e4ac77c.tar.gz dtc-7be250b4d059771c47be00ec8d4df7f47e4ac77c.tar.bz2 | |
libfdt: Correct condition for reordering blocks
This condition uses bitwise OR but should be logical OR. Fix it.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: kernel test robot <lkp@intel.com>
Message-Id: <20200615160033.87328-1-sjg@chromium.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'libfdt/fdt_rw.c')
| -rw-r--r-- | libfdt/fdt_rw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libfdt/fdt_rw.c b/libfdt/fdt_rw.c index 524b520..93e4a2b 100644 --- a/libfdt/fdt_rw.c +++ b/libfdt/fdt_rw.c @@ -436,7 +436,7 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize) return struct_size; } - if (can_assume(LIBFDT_ORDER) | + if (can_assume(LIBFDT_ORDER) || !fdt_blocks_misordered_(fdt, mem_rsv_size, struct_size)) { /* no further work necessary */ err = fdt_move(fdt, buf, bufsize); |