Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp444201imj; Thu, 7 Feb 2019 06:45:14 -0800 (PST) X-Google-Smtp-Source: AHgI3IZe7POdXJB3fhXWss7ooOSU1zQIBmgyelgDqDFIgWq1gZDDsHoWdgDXcUb1p0ALvx7xmLIX X-Received: by 2002:a62:5c1:: with SMTP id 184mr16352539pff.165.1549550714913; Thu, 07 Feb 2019 06:45:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549550714; cv=none; d=google.com; s=arc-20160816; b=dAk9l9U7Yx55kaYD1bEOMwzmuEmhCK9JR4ZpvXD3VwJxKPWyUzXt6g4k/3xWeuPJzV R9dz5/yP42Nq9ARGdiV2vEkK1z/ar6S87Lbw7n3bjpIXaxHroguQ/ATPL8GK19/tLS9R ytc7lg7Ojw3Za1IiqzCWAZ1z3VB44HIlQdNK3bM5RTMW6JHJRVuKu//ooBr65zfW9Org TluJ3my1l31ZteGpRLdTY6C9XuvgnNASEi7L3zzZ46fZk2T7AnJICYJ9qfAob78XO5IF zri3ltB/CVl+UgFJW1rH8Mi2+AjN/KYy/FNnfnWOG0kmyJiKZWB2aBjMt9Ff7EI3sKC0 TCNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from; bh=0YP08j9M9L3okbJUDk+VglRynbT+AlWa7knQTqul/Ak=; b=TNRpv0npO/GcP2e66fbCF4OnblHCdi9trunOU/x9lXOsktfGNNU6yFYotIKpwpr5qv YqwZdTCrnJ0cuZqf1YudQePi1tQa33YHbeJvq5pA4/08uwkqy3CfjmbFtaDx1maniruc 2e8BTZ0/kIKGezZKnsVTfSw46ZFJStHxzFJAH6gO7iq18EZWcQ3Z1uHVtsJnRelFr0yU 9IrDR4vnwP/GBY0CSL80+hZhFXWz2/3LGiR0Dms3muqvDO8Nk3yUyrXQD+/T/+5gm39G mhWL9xID06K+iEweVE2tbiOUEcuvegfnikzRgSEWYZUBKN3LUpEgvZBju4zTiUdbNEO3 YYgQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x74si9586104pfe.23.2019.02.07.06.44.58; Thu, 07 Feb 2019 06:45:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727021AbfBGOo3 (ORCPT + 99 others); Thu, 7 Feb 2019 09:44:29 -0500 Received: from mx2.suse.de ([195.135.220.15]:43168 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726558AbfBGOo2 (ORCPT ); Thu, 7 Feb 2019 09:44:28 -0500 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 Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, paul@pwsan.com, palmer@sifive.com, aou@eecs.berkeley.edu 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 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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"); -- 2.20.1 -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."