Merge tag 'v3.0.36' into android-3.0.x

[android-x86/kernel.git] / drivers / tty / serial / serial_core.c

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index db7912c..2a106a9 100644 (file)
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -91,6 +91,9 @@ static void __uart_start(struct tty_struct *tty)
        struct uart_state *state = tty->driver_data;
        struct uart_port *port = state->uart_port;
 
+       if (port->ops->wake_peer)
+               port->ops->wake_peer(port);
+
        if (!uart_circ_empty(&state->xmit) && state->xmit.buf &&
            !tty->stopped && !tty->hw_stopped)
                port->ops->start_tx(port);
@@ -2003,6 +2006,8 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
                if (port->tty && port->tty->termios && termios.c_cflag == 0)
                        termios = *(port->tty->termios);
 
+               if (console_suspend_enabled)
+                       uart_change_pm(state, 0);
                uport->ops->set_termios(uport, &termios, NULL);
                if (console_suspend_enabled)
                        console_start(uport->cons);
@@ -2323,6 +2328,7 @@ void uart_unregister_driver(struct uart_driver *drv)
        tty_unregister_driver(p);
        put_tty_driver(p);
        kfree(drv->state);
+       drv->state = NULL;
        drv->tty_driver = NULL;
 }