summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Ogness <john.ogness@linutronix.de>2022-11-16 17:27:38 +0106
committerPetr Mladek <pmladek@suse.com>2022-12-02 11:25:01 +0100
commit6e35d977fa1e2840e40ad6f09deefdf39d8437b4 (patch)
tree489126f7a96be7f478d756401aca3b93393799d0
parent34d9541edef7f6527d22fde9707b785adbb6d19a (diff)
downloadlinux-stable-6e35d977fa1e2840e40ad6f09deefdf39d8437b4.tar.gz
linux-stable-6e35d977fa1e2840e40ad6f09deefdf39d8437b4.tar.bz2
linux-stable-6e35d977fa1e2840e40ad6f09deefdf39d8437b4.zip
tty: serial: earlycon: use console_is_registered()
It is not reliable to check for CON_ENABLED in order to identify if a console is registered. Use console_is_registered() instead. Signed-off-by: John Ogness <john.ogness@linutronix.de> Reviewed-by: Petr Mladek <pmladek@suse.com> Signed-off-by: Petr Mladek <pmladek@suse.com> Link: https://lore.kernel.org/r/20221116162152.193147-27-john.ogness@linutronix.de
-rw-r--r--drivers/tty/serial/earlycon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index a5f380584cda..4f6e9bf57169 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -181,7 +181,7 @@ int __init setup_earlycon(char *buf)
if (!buf || !buf[0])
return -EINVAL;
- if (early_con.flags & CON_ENABLED)
+ if (console_is_registered(&early_con))
return -EALREADY;
again:
@@ -253,7 +253,7 @@ int __init of_setup_earlycon(const struct earlycon_id *match,
bool big_endian;
u64 addr;
- if (early_con.flags & CON_ENABLED)
+ if (console_is_registered(&early_con))
return -EALREADY;
spin_lock_init(&port->lock);