diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 04:43:21 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 04:43:21 +0100 |
| commit | 8d5c315059460e665c804d5a9b641f7f0a1e9dd7 (patch) | |
| tree | b9c598b2ac7a4fd7cf121ce733b98b0f18b8a1df /drivers/serial | |
| parent | [PATCH] When CONFIG_CC_OPTIMIZE_FOR_SIZE, allow gcc4 to control inlining (diff) | |
| parent | [ARM] 3262/4: allow ptraced syscalls to be overriden (diff) | |
| download | linux-8d5c315059460e665c804d5a9b641f7f0a1e9dd7.tar.xz linux-8d5c315059460e665c804d5a9b641f7f0a1e9dd7.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/imx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index 5c098be9346b..587cc6a95114 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c @@ -499,7 +499,7 @@ imx_set_termios(struct uart_port *port, struct termios *termios, ucr2 |= UCR2_STPB; if (termios->c_cflag & PARENB) { ucr2 |= UCR2_PREN; - if (!(termios->c_cflag & PARODD)) + if (termios->c_cflag & PARODD) ucr2 |= UCR2_PROE; } |