diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-10 14:53:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-10 14:53:51 -0800 |
| commit | 25bf368b3d98668c5d5f38e2201d8bca16e52680 (patch) | |
| tree | 17cfc952dba2d575d63f84a78790054b3953df61 | |
| parent | 0825c5d0f717816916f0e5ef9d89be51b3c52786 (diff) | |
| parent | fd401aee6273e869e2711de498e28f5208184797 (diff) | |
| download | op-kernel-dev-25bf368b3d98668c5d5f38e2201d8bca16e52680.zip op-kernel-dev-25bf368b3d98668c5d5f38e2201d8bca16e52680.tar.gz | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
| -rw-r--r-- | drivers/serial/ioc4_serial.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c index 1d85533..f3763d2 100644 --- a/drivers/serial/ioc4_serial.c +++ b/drivers/serial/ioc4_serial.c @@ -1717,11 +1717,9 @@ ioc4_change_speed(struct uart_port *the_port, } if (cflag & CRTSCTS) { - info->flags |= ASYNC_CTS_FLOW; port->ip_sscr |= IOC4_SSCR_HFC_EN; } else { - info->flags &= ~ASYNC_CTS_FLOW; port->ip_sscr &= ~IOC4_SSCR_HFC_EN; } writel(port->ip_sscr, &port->ip_serial_regs->sscr); @@ -1760,18 +1758,6 @@ static inline int ic4_startup_local(struct uart_port *the_port) info = the_port->info; - if (info->tty) { - set_bit(TTY_IO_ERROR, &info->tty->flags); - clear_bit(TTY_IO_ERROR, &info->tty->flags); - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI) - info->tty->alt_speed = 57600; - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI) - info->tty->alt_speed = 115200; - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI) - info->tty->alt_speed = 230400; - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP) - info->tty->alt_speed = 460800; - } local_open(port); /* set the speed of the serial port */ |
