diff options
| author | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 | 
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 | 
| commit | 1ac731c529cd4d6adbce134754b51ff7d822b145 (patch) | |
| tree | 143ab3f35ca5f3b69f583c84e6964b17139c2ec1 /drivers/tty/amiserial.c | |
| parent | 07b4c950f27bef0362dc6ad7ee713aab61d58149 (diff) | |
| parent | 54116d442e001e1b6bd482122043b1870998a1f3 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.6 merge window.
Diffstat (limited to 'drivers/tty/amiserial.c')
| -rw-r--r-- | drivers/tty/amiserial.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c index d7515d61659e..c06ad0a0744b 100644 --- a/drivers/tty/amiserial.c +++ b/drivers/tty/amiserial.c @@ -347,7 +347,7 @@ static void check_modem_status(struct serial_state *info)  #if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW))  				printk("CTS tx start...");  #endif -				port->tty->hw_stopped = 0; +				port->tty->hw_stopped = false;  				info->IER |= UART_IER_THRI;  				amiga_custom.intena = IF_SETCLR | IF_TBE;  				mb(); @@ -362,7 +362,7 @@ static void check_modem_status(struct serial_state *info)  #if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW))  				printk("CTS tx stop...");  #endif -				port->tty->hw_stopped = 1; +				port->tty->hw_stopped = true;  				info->IER &= ~UART_IER_THRI;  				/* disable Tx interrupt and remove any pending interrupts */  				amiga_custom.intena = IF_TBE; @@ -1197,7 +1197,7 @@ static void rs_set_termios(struct tty_struct *tty, const struct ktermios *old_te  	/* Handle turning off CRTSCTS */  	if ((old_termios->c_cflag & CRTSCTS) && !C_CRTSCTS(tty)) { -		tty->hw_stopped = 0; +		tty->hw_stopped = false;  		rs_start(tty);  	}  |