From patchwork Thu Feb 7 14:44:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 10801377 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E32051575 for ; Thu, 7 Feb 2019 14:44:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF428282EC for ; Thu, 7 Feb 2019 14:44:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C052F2DB15; Thu, 7 Feb 2019 14:44:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BCC03282EC for ; Thu, 7 Feb 2019 14:44:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:In-Reply-To: Date:References:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=V3Yf5dmByKkBqYpnOytrm9DEJ/bPuYyyGpkQXZjgMD8=; b=DNfMMcd0WOTVZ4 LctNHpNqnBVen14t6OQbjVU8+9eG1ktEewgQGC0sl5S+/XukkIADaGyNTCwkUEYibaGBFwOUdJvt3 tA+FStl7Zyp+DbidMSBZmw7llmuLcodhcJI3KEQvvY2Mz2tP5tADxypkamw/OGXDggy5rIOOhXmnO 78BDtKubpprcswUm55UaaC5cf4/X24fe6N4O7C0UE6c3imznyJNaKQSThIwxW13BP7dxVB5dcBfLn syhivW1oJlSC7CKVhnucRdHBgcra0epzVq3sTb1YfNLWRH6W6V0crxv4Hj9++HrxpmF9h3Fxv/PRw /WrNNU58K+73LoFVxzfQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1grkup-0008Pe-NT; Thu, 07 Feb 2019 14:44:35 +0000 Received: from mx2.suse.de ([195.135.220.15] helo=mx1.suse.de) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1grkun-0008NY-8Y for linux-riscv@lists.infradead.org; Thu, 07 Feb 2019 14:44:34 +0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 84374AD38; Thu, 7 Feb 2019 14:44:27 +0000 (UTC) From: Andreas Schwab To: Paul Walmsley Subject: [PATCH] arch: riscv: fix logic error in parse_dtb References: X-Yow: Why was I BORN? Date: Thu, 07 Feb 2019 15:44:26 +0100 In-Reply-To: (Paul Walmsley's message of "Mon, 17 Dec 2018 19:15:12 -0800 (PST)") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1.91 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190207_064433_448239_AB556DFF X-CRM114-Status: GOOD ( 12.41 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-riscv@lists.infradead.org, paul@pwsan.com, palmer@sifive.com, linux-kernel@vger.kernel.org, aou@eecs.berkeley.edu Sender: "linux-riscv" Errors-To: linux-riscv-bounces+patchwork-linux-riscv=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 45e9a2f053dc..84f19ca6d88b 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");