From a4f3f999cb6cdc2ae8a367d7d984dd2ce079835e Mon Sep 17 00:00:00 2001 From: Atsushi Nemoto Date: Thu, 2 Feb 2006 20:53:39 +0000 Subject: [PATCH] --- yaml --- r: 19735 b: refs/heads/master c: 9c0f4755bd5a117595761c95b93c29e8d9ca07b5 h: refs/heads/master i: 19733: ba87fc4da95dcd71aba53a41b733106246905f67 19731: 33a6f70d05acabc1d61867c29788652cc7a9b45b 19727: 34cda7f4942277983bb9f41797f562926c811af9 v: v3 --- [refs] | 2 +- trunk/drivers/serial/serial_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b2012db69d31..87b631eaf51f 100644 --- 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 index 0717abfdae06..95fb4939c675 100644 --- 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);