From 47bc8fd0b3dc5de4c77653c8277a287e7633923c Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Wed, 30 Mar 2011 00:10:56 +0200 Subject: [PATCH] --- yaml --- r: 248660 b: refs/heads/master c: 303a7a1199c20f7c9452f024a6e17bf348b6b398 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/serial_core.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 88bcdc665cd7..a155fad7fbf6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7d7abff40c27f82fe78b1091ab3fad69b2546f9 +refs/heads/master: 303a7a1199c20f7c9452f024a6e17bf348b6b398 diff --git a/trunk/drivers/tty/serial/serial_core.c b/trunk/drivers/tty/serial/serial_core.c index 47657cf4f8b9..3aae8ed2a8f5 100644 --- a/trunk/drivers/tty/serial/serial_core.c +++ b/trunk/drivers/tty/serial/serial_core.c @@ -1483,20 +1483,6 @@ static void uart_hangup(struct tty_struct *tty) static void uart_update_termios(struct tty_struct *tty, struct uart_state *state) { - struct uart_port *port = state->uart_port; - - /* - * If the device failed to grab its irq resources, - * or some other error occurred, don't try to talk - * to the port hardware. - */ - if (!(tty->flags & (1 << TTY_IO_ERROR))) { - /* - * And finally enable the RTS and DTR signals. - */ - if (tty->termios->c_cflag & CBAUD) - uart_set_mctrl(port, TIOCM_DTR | TIOCM_RTS); - } } static int uart_carrier_raised(struct tty_port *port)