Skip to contentSkip to conversation

of/fdt: don't ignore errors from of_setup_earlycon

PATCH Applied Christoph Hellwig 2 participants 2 messages Sep 10, 2019 – Sep 30, 2019 Device tree

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 of/fdt: don't ignore errors from of_setup_earlycon

If of_setup_earlycon we should keep on iterating earlycon options instead of breaking out of the loop.

---
 drivers/of/fdt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/of/fdt.c +2 -2
index 9cdf14b9aaab..2f6bd03d8e27 100644
@@ -946,8 +946,8 @@ int __init early_init_dt_scan_chosen_stdout(void)
 		if (fdt_node_check_compatible(fdt, offset, match->compatible))
 			continue;
 
-		of_setup_earlycon(match, offset, options);
-		return 0;
+		if (of_setup_earlycon(match, offset, options) == 0)
+			return 0;
 	}
 	return -ENODEV;
 }
Signature · 1 line
2.20.1
maintainer Applied
#1 lore raw
Quoted 8 lines · Christoph Hellwig

If of_setup_earlycon we should keep on iterating earlycon options instead of breaking out of the loop.

---
 drivers/of/fdt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

Rob