Browse Source

serial: earlycon: Only try fdt when specify 'earlycon' exactly

When moving earlycon early_param handling to serial, the devicetree
earlycons enable condition changed slightly.

We used to only do that for 'console'/'earlycon', but now would also
for 'console='/'earlycon='.

Fix it by using the same condition like before.

Fixes: d503187b6cc4 (of/serial: move earlycon early_param handling to serial)
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jeffy Chen 8 years ago
parent
commit
447ef990ad
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/tty/serial/earlycon.c

+ 1 - 1
drivers/tty/serial/earlycon.c

@@ -220,7 +220,7 @@ static int __init param_setup_earlycon(char *buf)
 		if (IS_ENABLED(CONFIG_ACPI_SPCR_TABLE)) {
 		if (IS_ENABLED(CONFIG_ACPI_SPCR_TABLE)) {
 			earlycon_init_is_deferred = true;
 			earlycon_init_is_deferred = true;
 			return 0;
 			return 0;
-		} else {
+		} else if (!buf) {
 			return early_init_dt_scan_chosen_stdout();
 			return early_init_dt_scan_chosen_stdout();
 		}
 		}
 	}
 	}