From: Andreas Schwab <schwab@suse.de>
Date: Thu, 7 Feb 2019 14:44:26 +0000 (+0100)
Subject: arch: riscv: fix logic error in parse_dtb
X-Git-Tag: v5.1-rc1~129^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7ccc35aa3bd728ad8451f4d06e801cfe5c5498c;p=thirdparty%2Fkernel%2Flinux.git

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 <schwab@suse.de>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Reviewed-by: Paul Walmsley <paul.walmsley@sifive.com>
Tested-by: Paul Walmsley <paul.walmsley@sifive.com> # FU540 HiFive-U BBL
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
---

diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c
index 61c8161650ef8..12a16df4d422f 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");