From acdb34372845f9c3b098f18f4b6e67ea0d844d82 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Mon, 8 Mar 2010 21:50:11 -0600 Subject: [PATCH] --- yaml --- r: 188813 b: refs/heads/master c: 336cee42dd52824e360ab419eab4e8888eb054ec h: refs/heads/master i: 188811: 3a869fe22a2ca22a69f11b1caed20fde2a21108f v: v3 --- [refs] | 2 +- trunk/drivers/char/tty_port.c | 2 +- trunk/drivers/usb/serial/console.c | 1 + trunk/include/linux/tty.h | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9e4d998173d4..afb7c0e71887 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 231443665882a02214c3748b9f86615a3ce9e5c2 +refs/heads/master: 336cee42dd52824e360ab419eab4e8888eb054ec diff --git a/trunk/drivers/char/tty_port.c b/trunk/drivers/char/tty_port.c index be492dd66437..a3bd1d0b66cf 100644 --- a/trunk/drivers/char/tty_port.c +++ b/trunk/drivers/char/tty_port.c @@ -119,7 +119,7 @@ EXPORT_SYMBOL(tty_port_tty_set); static void tty_port_shutdown(struct tty_port *port) { mutex_lock(&port->mutex); - if (port->ops->shutdown && + if (port->ops->shutdown && !port->console && test_and_clear_bit(ASYNCB_INITIALIZED, &port->flags)) port->ops->shutdown(port); mutex_unlock(&port->mutex); diff --git a/trunk/drivers/usb/serial/console.c b/trunk/drivers/usb/serial/console.c index b22ac3258523..f347da2ef00a 100644 --- a/trunk/drivers/usb/serial/console.c +++ b/trunk/drivers/usb/serial/console.c @@ -181,6 +181,7 @@ static int usb_console_setup(struct console *co, char *options) /* The console is special in terms of closing the device so * indicate this port is now acting as a system console. */ port->console = 1; + port->port.console = 1; mutex_unlock(&serial->disc_mutex); return retval; diff --git a/trunk/include/linux/tty.h b/trunk/include/linux/tty.h index 593228a520e1..4409967db0c4 100644 --- a/trunk/include/linux/tty.h +++ b/trunk/include/linux/tty.h @@ -224,6 +224,7 @@ struct tty_port { wait_queue_head_t close_wait; /* Close waiters */ wait_queue_head_t delta_msr_wait; /* Modem status change */ unsigned long flags; /* TTY flags ASY_*/ + unsigned char console:1; /* port is a console */ struct mutex mutex; /* Locking */ struct mutex buf_mutex; /* Buffer alloc lock */ unsigned char *xmit_buf; /* Optional buffer */