Merge tag 'staging-5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[sfrench/cifs-2.6.git] / drivers / staging / greybus / uart.c

diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c
index 55c51143bb0940998b19396a56b39cba3bbd7447..4ffb334cd5cde56f5011692dc4fa83ae1ca27bda 100644 (file)
--- a/drivers/staging/greybus/uart.c
+++ b/drivers/staging/greybus/uart.c
@@ -537,9 +537,9 @@ static void gb_tty_set_termios(struct tty_struct *tty,
        }
 
        if (C_CRTSCTS(tty) && C_BAUD(tty) != B0)
-               newline.flow_control |= GB_SERIAL_AUTO_RTSCTS_EN;
+               newline.flow_control = GB_SERIAL_AUTO_RTSCTS_EN;
        else
-               newline.flow_control &= ~GB_SERIAL_AUTO_RTSCTS_EN;
+               newline.flow_control = 0;
 
        if (memcmp(&gb_tty->line_coding, &newline, sizeof(newline))) {
                memcpy(&gb_tty->line_coding, &newline, sizeof(newline));