diff --git a/[refs] b/[refs] index b6a432f1f964..fed318722a15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd29c7277126db6884df42d41f2fbe2ebc10041e +refs/heads/master: 3261e362f603cf2649f90e9ad2d1a1f98f69291a diff --git a/trunk/drivers/serial/imx.c b/trunk/drivers/serial/imx.c index 5c098be9346b..587cc6a95114 100644 --- a/trunk/drivers/serial/imx.c +++ b/trunk/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; }