From eaadf704976f575d6d2c43a96580e85b8eb3c598 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 15 Jun 2020 10:00:33 -0600 Subject: libfdt: Correct condition for reordering blocks This condition uses bitwise OR but should be logical OR. Fix it. Signed-off-by: Simon Glass Reported-by: kernel test robot Message-Id: <20200615160033.87328-1-sjg@chromium.org> Signed-off-by: David Gibson --- cpukit/dtc/libfdt/fdt_rw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cpukit/dtc') diff --git a/cpukit/dtc/libfdt/fdt_rw.c b/cpukit/dtc/libfdt/fdt_rw.c index 524b520c84..93e4a2b563 100644 --- a/cpukit/dtc/libfdt/fdt_rw.c +++ b/cpukit/dtc/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); -- cgit v1.2.3