diff options
| author | Colin Cross <ccross@android.com> | 2010-10-06 16:31:32 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-10-06 16:32:09 -0700 |
| commit | 98959c85632cde43fc83ba1b709f767fc3b8a4ee (patch) | |
| tree | be7912bc7cd8c2aab86922da933439ff951ab602 /drivers/serial | |
| parent | 5c4a97667fdf6705d6c9f9e4b42dd7deb4da6978 (diff) | |
| parent | df5ac72e83df9fd8d735d40d5be464d4b66d6074 (diff) | |
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Conflicts:
drivers/input/touchscreen/Kconfig
Change-Id: Ifc75266e258f9513d78c47c12e2f1de1d2344f02
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/serial_core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c index cd8511298bcb..076cfd1546d4 100644 --- a/drivers/serial/serial_core.c +++ b/drivers/serial/serial_core.c @@ -94,6 +94,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); |