Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 248660
b: refs/heads/master
c: 303a7a1
h: refs/heads/master
v: v3
  • Loading branch information
Jiri Slaby authored and Greg Kroah-Hartman committed Apr 19, 2011
1 parent 9cf65fb commit 47bc8fd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c7d7abff40c27f82fe78b1091ab3fad69b2546f9
refs/heads/master: 303a7a1199c20f7c9452f024a6e17bf348b6b398
14 changes: 0 additions & 14 deletions trunk/drivers/tty/serial/serial_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 47bc8fd

Please sign in to comment.