aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/serial/serial_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 0717abfdae06..95fb4939c675 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -2237,7 +2237,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *port)
2237 * If this port is a console, then the spinlock is already 2237 * If this port is a console, then the spinlock is already
2238 * initialised. 2238 * initialised.
2239 */ 2239 */
2240 if (!uart_console(port)) 2240 if (!(uart_console(port) && (port->cons->flags & CON_ENABLED)))
2241 spin_lock_init(&port->lock); 2241 spin_lock_init(&port->lock);
2242 2242
2243 uart_configure_port(drv, state, port); 2243 uart_configure_port(drv, state, port);