git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'upstream-fixes' and 'magicmouse' into for-linus
[pandora-kernel.git]
/
drivers
/
tty
/
serial
/
omap-serial.c
diff --git
a/drivers/tty/serial/omap-serial.c
b/drivers/tty/serial/omap-serial.c
index
c37df8d
..
5e713d3
100644
(file)
--- a/
drivers/tty/serial/omap-serial.c
+++ b/
drivers/tty/serial/omap-serial.c
@@
-806,8
+806,7
@@
serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
serial_omap_set_mctrl(&up->port, up->port.mctrl);
/* Software Flow Control Configuration */
serial_omap_set_mctrl(&up->port, up->port.mctrl);
/* Software Flow Control Configuration */
- if (termios->c_iflag & (IXON | IXOFF))
- serial_omap_configure_xonxoff(up, termios);
+ serial_omap_configure_xonxoff(up, termios);
spin_unlock_irqrestore(&up->port.lock, flags);
dev_dbg(up->port.dev, "serial_omap_set_termios+%d\n", up->pdev->id);
spin_unlock_irqrestore(&up->port.lock, flags);
dev_dbg(up->port.dev, "serial_omap_set_termios+%d\n", up->pdev->id);