diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-06-23 09:43:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-06-23 09:43:31 +0200 |
| commit | 0e5342f634b26eed0a0fb21daa53a45449396c3f (patch) | |
| tree | b5fecfc08effd2cd7b4e3e6173f317c9e53e0280 /include/linux/usb | |
| parent | e6ecc0414c87126836d04b46cce8942e778226bb (diff) | |
| parent | ffa5f7a3bf28c1306eef85d4056539c2d4b8eb09 (diff) | |
Merge tag 'usb-serial-6.5-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
Johan writes:
USB-serial updates for 6.5-rc1
Here are the USB-serial updates for 6.5-rc1, including:
- improved error handling for break signalling
- report to user space when a device does not support break signalling
Included are also some new modem device ids.
All have been in linux-next with no reported issues.
* tag 'usb-serial-6.5-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
USB: serial: option: add LARA-R6 01B PIDs
USB: serial: report unsupported break signalling
USB: serial: cp210x: disable break signalling on CP2105 SCI
USB: serial: return errors from break handling
Diffstat (limited to 'include/linux/usb')
| -rw-r--r-- | include/linux/usb/serial.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h index 7eeb5f9c4f0d..1a0a4dc87980 100644 --- a/include/linux/usb/serial.h +++ b/include/linux/usb/serial.h @@ -278,7 +278,7 @@ struct usb_serial_driver { int (*set_serial)(struct tty_struct *tty, struct serial_struct *ss); void (*set_termios)(struct tty_struct *tty, struct usb_serial_port *port, const struct ktermios *old); - void (*break_ctl)(struct tty_struct *tty, int break_state); + int (*break_ctl)(struct tty_struct *tty, int break_state); unsigned int (*chars_in_buffer)(struct tty_struct *tty); void (*wait_until_sent)(struct tty_struct *tty, long timeout); bool (*tx_empty)(struct usb_serial_port *port); |