From: Kefeng Wang <wangkefeng.wang@huawei.com>
Date: Tue, 16 May 2017 07:36:16 +0000 (+0800)
Subject: arm64: check return value of of_flat_dt_get_machine_name
X-Git-Tag: v4.13-rc1~147^2~53
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=690e95dd4d67be2eb905e1480b692c84e612a71a;p=karo-tx-linux.git

arm64: check return value of of_flat_dt_get_machine_name

It's useless to print machine name and setup arch-specific system
identifiers if of_flat_dt_get_machine_name() return NULL, especially
when ACPI-based boot.

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 2c822ef94f34..d4b740538ad5 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -194,6 +194,9 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys)
 	}
 
 	name = of_flat_dt_get_machine_name();
+	if (!name)
+		return;
+
 	pr_info("Machine model: %s\n", name);
 	dump_stack_set_arch_desc("%s (DT)", name);
 }