diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 17:48:37 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 17:48:37 -0800 |
commit | ed28f96ac1960f30f818374d65be71d2fdf811b0 (patch) | |
tree | 7229e77dbd27eee1378d1317c63c272dbe57cac0 /drivers/serial | |
parent | 1480d0a31db62b9803f829cc0e5cc71935ffe3cc (diff) | |
parent | a2436b22deac7834e0f87897b207a2dc1407dc40 (diff) | |
download | linux-3.10-ed28f96ac1960f30f818374d65be71d2fdf811b0.tar.gz linux-3.10-ed28f96ac1960f30f818374d65be71d2fdf811b0.tar.bz2 linux-3.10-ed28f96ac1960f30f818374d65be71d2fdf811b0.zip |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/serial_core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c index 2d8622eef70..401d94a7fe2 100644 --- a/drivers/serial/serial_core.c +++ b/drivers/serial/serial_core.c @@ -147,8 +147,7 @@ static int uart_startup(struct uart_state *state, int init_hw) * once we have successfully opened the port. Also set * up the tty->alt_speed kludge */ - if (info->tty) - set_bit(TTY_IO_ERROR, &info->tty->flags); + set_bit(TTY_IO_ERROR, &info->tty->flags); if (port->type == PORT_UNKNOWN) return 0; |