From c2187dc4bf34e529401d7e2654f6b77bca738dc4 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 23 Oct 2015 20:47:20 +0900 Subject: [PATCH] of/fdt: fix error checking for earlycon address commit 3f5ceec96470050d20d7281d49985e3b1cfc3995 upstream. fdt_translate_address() returns OF_BAD_ADDR on error. It is defined as a u64 value, so the variable "addr" should be defined as u64 as well. Fixes: fb11ffe74c79 ("of/fdt: add FDT serial scanning for earlycon") Signed-off-by: Masahiro Yamada Signed-off-by: Rob Herring Signed-off-by: Luis Henriques --- drivers/of/fdt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 5c437ca532b3e..24ad551291944 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -774,14 +774,15 @@ int __init early_init_dt_scan_chosen_serial(void) return -ENODEV; while (match->compatible[0]) { - unsigned long addr; + u64 addr; + if (fdt_node_check_compatible(fdt, offset, match->compatible)) { match++; continue; } addr = fdt_translate_address(fdt, offset); - if (!addr) + if (addr == OF_BAD_ADDR) return -ENXIO; of_setup_earlycon(addr, match->data); -- 2.47.3