Commit 3f5ceec9 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Rob Herring

of/fdt: fix error checking for earlycon address

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: fb11ffe7 ("of/fdt: add FDT serial scanning for earlycon")
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 001cf504
...@@ -822,14 +822,15 @@ static int __init early_init_dt_scan_chosen_serial(void) ...@@ -822,14 +822,15 @@ static int __init early_init_dt_scan_chosen_serial(void)
return -ENODEV; return -ENODEV;
while (match->compatible[0]) { while (match->compatible[0]) {
unsigned long addr; u64 addr;
if (fdt_node_check_compatible(fdt, offset, match->compatible)) { if (fdt_node_check_compatible(fdt, offset, match->compatible)) {
match++; match++;
continue; continue;
} }
addr = fdt_translate_address(fdt, offset); addr = fdt_translate_address(fdt, offset);
if (!addr) if (addr == OF_BAD_ADDR)
return -ENXIO; return -ENXIO;
of_setup_earlycon(addr, match->data); of_setup_earlycon(addr, match->data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment