| Message ID | 20210330143716.9042-1-johan@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ea7ada4de2f7406150dd35ecd0302842587a464e |
| Headers | show |
| Series | USB: serial: xr: fix CSIZE handling | expand |
On Tue, Mar 30, 2021 at 04:37:16PM +0200, Johan Hovold wrote: > The XR21V141X does not have a 5- or 6-bit mode, but the current > implementation failed to properly restore the old setting when CS5 or > CS6 was requested. Instead an invalid request would be sent to the > device. > > Fixes: c2d405aa86b4 ("USB: serial: add MaxLinear/Exar USB to Serial driver") > Signed-off-by: Johan Hovold <johan@kernel.org> Reviewed-by: Manivannan Sadhasivam <mani@kernel.org> Thanks, Mani > --- > drivers/usb/serial/xr_serial.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/usb/serial/xr_serial.c b/drivers/usb/serial/xr_serial.c > index 0ca04906da4b..c59c8b47a120 100644 > --- a/drivers/usb/serial/xr_serial.c > +++ b/drivers/usb/serial/xr_serial.c > @@ -467,6 +467,11 @@ static void xr_set_termios(struct tty_struct *tty, > termios->c_cflag &= ~CSIZE; > if (old_termios) > termios->c_cflag |= old_termios->c_cflag & CSIZE; > + else > + termios->c_cflag |= CS8; > + > + if (C_CSIZE(tty) == CS7) > + bits |= XR21V141X_UART_DATA_7; > else > bits |= XR21V141X_UART_DATA_8; > break; > -- > 2.26.3 >
diff --git a/drivers/usb/serial/xr_serial.c b/drivers/usb/serial/xr_serial.c index 0ca04906da4b..c59c8b47a120 100644 --- a/drivers/usb/serial/xr_serial.c +++ b/drivers/usb/serial/xr_serial.c @@ -467,6 +467,11 @@ static void xr_set_termios(struct tty_struct *tty, termios->c_cflag &= ~CSIZE; if (old_termios) termios->c_cflag |= old_termios->c_cflag & CSIZE; + else + termios->c_cflag |= CS8; + + if (C_CSIZE(tty) == CS7) + bits |= XR21V141X_UART_DATA_7; else bits |= XR21V141X_UART_DATA_8; break;
The XR21V141X does not have a 5- or 6-bit mode, but the current implementation failed to properly restore the old setting when CS5 or CS6 was requested. Instead an invalid request would be sent to the device. Fixes: c2d405aa86b4 ("USB: serial: add MaxLinear/Exar USB to Serial driver") Signed-off-by: Johan Hovold <johan@kernel.org> --- drivers/usb/serial/xr_serial.c | 5 +++++ 1 file changed, 5 insertions(+)