1 files changed, 24 insertions, 20 deletions

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 2cf5649a6dc0..b68550d95a40 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -89,8 +89,7 @@ static void __uart_start(struct tty_struct *tty)
         struct uart_state *state = tty->driver_data;
         struct uart_port *port = state->uart_port;
 
-        if (!uart_circ_empty(&state->xmit) && state->xmit.buf &&
-            !tty->stopped && !tty->hw_stopped)
+        if (!tty->stopped && !tty->hw_stopped)
                 port->ops->start_tx(port);
 }
 
@@ -138,6 +137,11 @@ static int uart_port_startup(struct tty_struct *tty, struct uart_state *state,
                 return 1;
 
         /*
+         * Make sure the device is in D0 state.
+         */
+        uart_change_pm(state, UART_PM_STATE_ON);
+
+        /*
          * Initialise and allocate the transmit and temporary
          * buffer.
          */
@@ -826,25 +830,29 @@ static int uart_set_info(struct tty_struct *tty, struct tty_port *port,
                  * If we fail to request resources for the
                  * new port, try to restore the old settings.
                  */
-                if (retval && old_type != PORT_UNKNOWN) {
+                if (retval) {
                         uport->iobase = old_iobase;
                         uport->type = old_type;
                         uport->hub6 = old_hub6;
                         uport->iotype = old_iotype;
                         uport->regshift = old_shift;
                         uport->mapbase = old_mapbase;
-                        retval = uport->ops->request_port(uport);
-                        /*
-                         * If we failed to restore the old settings,
-                         * we fail like this.
-                         */
-                        if (retval)
-                                uport->type = PORT_UNKNOWN;
 
-                        /*
-                         * We failed anyway.
-                         */
-                        retval = -EBUSY;
+                        if (old_type != PORT_UNKNOWN) {
+                                retval = uport->ops->request_port(uport);
+                                /*
+                                 * If we failed to restore the old settings,
+                                 * we fail like this.
+                                 */
+                                if (retval)
+                                        uport->type = PORT_UNKNOWN;
+
+                                /*
+                                 * We failed anyway.
+                                 */
+                                retval = -EBUSY;
+                        }
+
                         /* Added to return the correct error -Ram Gupta */
                         goto exit;
                 }
@@ -1452,6 +1460,8 @@ static void uart_hangup(struct tty_struct *tty)
                 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
                 spin_unlock_irqrestore(&port->lock, flags);
                 tty_port_tty_set(port, NULL);
+                if (!uart_console(state->uart_port))
+                        uart_change_pm(state, UART_PM_STATE_OFF);
                 wake_up_interruptible(&port->open_wait);
                 wake_up_interruptible(&port->delta_msr_wait);
         }
@@ -1570,12 +1580,6 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
         }
 
         /*
-         * Make sure the device is in D0 state.
-         */
-        if (port->count == 1)
-                uart_change_pm(state, UART_PM_STATE_ON);
-
-        /*
          * Start up the serial port.
          */
         retval = uart_startup(tty, state, 0);