aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2014-11-18 05:18:02 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-25 20:06:39 -0500
commitf0c1e460452138df03cb7a7f0e7546b74950b783 (patch)
tree62b59930e8620d24b51ea3e44198bd07fb958433
parentcb8ee9f08c4abfd8744eabffc467c06795c835d9 (diff)
serial: tegra: clean up tty-flag assignments
The tty break and error flags are not bit masks so do not to use bitwise OR when assigning them. Note that there is no functional change due to the if-else construct and flag having been initialised to zero (TTY_NORMAL). Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/serial-tegra.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/serial/serial-tegra.c b/drivers/tty/serial/serial-tegra.c
index 78a5cf65bf02..48e6e41636b2 100644
--- a/drivers/tty/serial/serial-tegra.c
+++ b/drivers/tty/serial/serial-tegra.c
@@ -319,16 +319,16 @@ static char tegra_uart_decode_rx_error(struct tegra_uart_port *tup,
319 if (unlikely(lsr & TEGRA_UART_LSR_ANY)) { 319 if (unlikely(lsr & TEGRA_UART_LSR_ANY)) {
320 if (lsr & UART_LSR_OE) { 320 if (lsr & UART_LSR_OE) {
321 /* Overrrun error */ 321 /* Overrrun error */
322 flag |= TTY_OVERRUN; 322 flag = TTY_OVERRUN;
323 tup->uport.icount.overrun++; 323 tup->uport.icount.overrun++;
324 dev_err(tup->uport.dev, "Got overrun errors\n"); 324 dev_err(tup->uport.dev, "Got overrun errors\n");
325 } else if (lsr & UART_LSR_PE) { 325 } else if (lsr & UART_LSR_PE) {
326 /* Parity error */ 326 /* Parity error */
327 flag |= TTY_PARITY; 327 flag = TTY_PARITY;
328 tup->uport.icount.parity++; 328 tup->uport.icount.parity++;
329 dev_err(tup->uport.dev, "Got Parity errors\n"); 329 dev_err(tup->uport.dev, "Got Parity errors\n");
330 } else if (lsr & UART_LSR_FE) { 330 } else if (lsr & UART_LSR_FE) {
331 flag |= TTY_FRAME; 331 flag = TTY_FRAME;
332 tup->uport.icount.frame++; 332 tup->uport.icount.frame++;
333 dev_err(tup->uport.dev, "Got frame errors\n"); 333 dev_err(tup->uport.dev, "Got frame errors\n");
334 } else if (lsr & UART_LSR_BI) { 334 } else if (lsr & UART_LSR_BI) {