Browse Source

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>
main
Simon Glass 4 years ago committed by David Gibson
parent
commit
7be250b4d0
  1. 2
      libfdt/fdt_rw.c

2
libfdt/fdt_rw.c

@ -436,7 +436,7 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize) @@ -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);

Loading…
Cancel
Save