diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 20:48:37 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 20:48:37 -0500 |
| commit | ed28f96ac1960f30f818374d65be71d2fdf811b0 (patch) | |
| tree | 7229e77dbd27eee1378d1317c63c272dbe57cac0 | |
| parent | 1480d0a31db62b9803f829cc0e5cc71935ffe3cc (diff) | |
| parent | a2436b22deac7834e0f87897b207a2dc1407dc40 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-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 2d8622eef701..401d94a7fe2e 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) | |||
| 147 | * once we have successfully opened the port. Also set | 147 | * once we have successfully opened the port. Also set |
| 148 | * up the tty->alt_speed kludge | 148 | * up the tty->alt_speed kludge |
| 149 | */ | 149 | */ |
| 150 | if (info->tty) | 150 | set_bit(TTY_IO_ERROR, &info->tty->flags); |
| 151 | set_bit(TTY_IO_ERROR, &info->tty->flags); | ||
| 152 | 151 | ||
| 153 | if (port->type == PORT_UNKNOWN) | 152 | if (port->type == PORT_UNKNOWN) |
| 154 | return 0; | 153 | return 0; |