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/bluetooth/hci_ldisc.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/bluetooth/hci_ldisc.c')
| -rw-r--r-- | drivers/bluetooth/hci_ldisc.c | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index 865112e96ff9..efdda2c3fce8 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c @@ -323,9 +323,9 @@ void hci_uart_set_flow_control(struct hci_uart *hu, bool enable)  		/* Disable hardware flow control */  		ktermios = tty->termios;  		ktermios.c_cflag &= ~CRTSCTS; -		status = tty_set_termios(tty, &ktermios); +		tty_set_termios(tty, &ktermios);  		BT_DBG("Disabling hardware flow control: %s", -		       status ? "failed" : "success"); +		       (tty->termios.c_cflag & CRTSCTS) ? "failed" : "success");  		/* Clear RTS to prevent the device from sending */  		/* Most UARTs need OUT2 to enable interrupts */ @@ -357,9 +357,9 @@ void hci_uart_set_flow_control(struct hci_uart *hu, bool enable)  		/* Re-enable hardware flow control */  		ktermios = tty->termios;  		ktermios.c_cflag |= CRTSCTS; -		status = tty_set_termios(tty, &ktermios); +		tty_set_termios(tty, &ktermios);  		BT_DBG("Enabling hardware flow control: %s", -		       status ? "failed" : "success"); +		       !(tty->termios.c_cflag & CRTSCTS) ? "failed" : "success");  	}  }  |