Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 275780
b: refs/heads/master
c: 604fdb7
h: refs/heads/master
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Nov 15, 2011
1 parent 37c134d commit bc7b471
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 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: 9636b755da7b498094bdf15b4ce9f6fd16995e4e
refs/heads/master: 604fdb75094a7367e1794fd0f62183380364ce13
4 changes: 1 addition & 3 deletions trunk/drivers/tty/serial/mfd.c
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,6 @@ serial_hsu_set_termios(struct uart_port *port, struct ktermios *termios,
{
struct uart_hsu_port *up =
container_of(port, struct uart_hsu_port, port);
struct tty_struct *tty = port->state->port.tty;
unsigned char cval, fcr = 0;
unsigned long flags;
unsigned int baud, quot;
Expand All @@ -907,8 +906,7 @@ serial_hsu_set_termios(struct uart_port *port, struct ktermios *termios,
}

/* CMSPAR isn't supported by this driver */
if (tty)
tty->termios->c_cflag &= ~CMSPAR;
termios->c_cflag &= ~CMSPAR;

if (termios->c_cflag & CSTOPB)
cval |= UART_LCR_STOP;
Expand Down

0 comments on commit bc7b471

Please sign in to comment.