From: Johan Hovold Date: Tue, 30 Mar 2021 14:37:16 +0000 (+0200) Subject: USB: serial: xr: fix CSIZE handling X-Git-Tag: v5.15~1313^2~20^2~62 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea7ada4de2f7406150dd35ecd0302842587a464e;p=platform%2Fkernel%2Flinux-starfive.git USB: serial: xr: fix CSIZE handling 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") Reviewed-by: Manivannan Sadhasivam Cc: stable@vger.kernel.org # 5.12 Signed-off-by: Johan Hovold --- diff --git a/drivers/usb/serial/xr_serial.c b/drivers/usb/serial/xr_serial.c index 0ca0490..c59c8b4 100644 --- a/drivers/usb/serial/xr_serial.c +++ b/drivers/usb/serial/xr_serial.c @@ -468,6 +468,11 @@ static void xr_set_termios(struct tty_struct *tty, 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; case CS7: