---

yaml --- r: 19735 b: refs/heads/master c: 9c0f475 h: refs/heads/master i: 19733: ba87fc4 19731: 33a6f70 19727: 34cda7f v: v3
git-mirror · Feb 2, 2006 · a4f3f99 · a4f3f99
1 parent fd637fa
commit a4f3f99
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ec9c59449744dcc390d593a017d30671546fd9e
+refs/heads/master: 9c0f4755bd5a117595761c95b93c29e8d9ca07b5
diff --git a/trunk/drivers/serial/serial_core.c b/trunk/drivers/serial/serial_core.c
@@ -2237,7 +2237,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *port)
 	 * If this port is a console, then the spinlock is already
 	 * initialised.
 	 */
-	if (!uart_console(port))
+	if (!(uart_console(port) && (port->cons->flags & CON_ENABLED)))
 		spin_lock_init(&port->lock);
 
 	uart_configure_port(drv, state, port);