diff options
| author | Jeffy Chen <jeffy.chen@rock-chips.com> | 2017-08-19 09:43:17 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-28 20:51:21 +0200 |
| commit | 447ef990ad9e909443ec16edb837c6e37664f5ba (patch) | |
| tree | 1712bd08467b00306533dd7c0384712bb86cce93 /drivers/tty | |
| parent | 454d23797a61c2c7424fb737ec417db7dd22bc60 (diff) | |
| download | linux-447ef990ad9e909443ec16edb837c6e37664f5ba.tar.gz linux-447ef990ad9e909443ec16edb837c6e37664f5ba.tar.bz2 linux-447ef990ad9e909443ec16edb837c6e37664f5ba.zip | |
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>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/earlycon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c index c3651540e1ba..335933e1822c 100644 --- a/drivers/tty/serial/earlycon.c +++ b/drivers/tty/serial/earlycon.c @@ -220,7 +220,7 @@ static int __init param_setup_earlycon(char *buf) if (IS_ENABLED(CONFIG_ACPI_SPCR_TABLE)) { earlycon_init_is_deferred = true; return 0; - } else { + } else if (!buf) { return early_init_dt_scan_chosen_stdout(); } } |