From f7ccc35aa3bd728ad8451f4d06e801cfe5c5498c Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 7 Feb 2019 15:44:26 +0100 Subject: [PATCH] arch: riscv: fix logic error in parse_dtb The function early_init_dt_scan returns true if a DTB was detected. Fixes: 8fd6e05c7463 ("arch: riscv: support kernel command line forcing when no DTB passed") Signed-off-by: Andreas Schwab Reviewed-by: Atish Patra Reviewed-by: Paul Walmsley Tested-by: Paul Walmsley # FU540 HiFive-U BBL Signed-off-by: Palmer Dabbelt --- arch/riscv/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index 61c8161650ef..12a16df4d422 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -140,7 +140,7 @@ asmlinkage void __init setup_vm(void) void __init parse_dtb(unsigned int hartid, void *dtb) { - if (!early_init_dt_scan(__va(dtb))) + if (early_init_dt_scan(__va(dtb))) return; pr_err("No DTB passed to the kernel\n");