On Mon, Jun 15, 2020 at 10:00:33AM -0600, Simon Glass wrote:
> This condition uses bitwise OR but should be logical OR. Fix it.
>
> Signed-off-by: Simon Glass <sjg@xxxxxxxxxxxx>
> Reported-by: kernel test robot <lkp@xxxxxxxxx>
Applied, thanks.
> ---
>
> libfdt/fdt_rw.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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);
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
Attachment:
signature.asc
Description: PGP signature
