diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 06:05:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 06:05:25 -0400 |
| commit | 6c009ecef8cca28c7c09eb16d0802e37915a76e1 (patch) | |
| tree | 11c773f780186fdb9fbc9c80a73fb7c8426b1fba /drivers/char/mxser.c | |
| parent | 98c2aaf8be5baf7193be37fb28bce8e7327158bc (diff) | |
| parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) | |
Merge branch 'linus' into perfcounters/core
Merge reason: need the upstream facility added by:
7f1e2ca: hrtimer: fix rq->lock inversion (again)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/char/mxser.c')
| -rw-r--r-- | drivers/char/mxser.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c index 402c9f217f83..a420e8d437dd 100644 --- a/drivers/char/mxser.c +++ b/drivers/char/mxser.c | |||
| @@ -820,7 +820,6 @@ static void mxser_check_modem_status(struct tty_struct *tty, | |||
| 820 | wake_up_interruptible(&port->port.open_wait); | 820 | wake_up_interruptible(&port->port.open_wait); |
| 821 | } | 821 | } |
| 822 | 822 | ||
| 823 | tty = tty_port_tty_get(&port->port); | ||
| 824 | if (port->port.flags & ASYNC_CTS_FLOW) { | 823 | if (port->port.flags & ASYNC_CTS_FLOW) { |
| 825 | if (tty->hw_stopped) { | 824 | if (tty->hw_stopped) { |
| 826 | if (status & UART_MSR_CTS) { | 825 | if (status & UART_MSR_CTS) { |