diff options
| author | Johan Hovold <johan@kernel.org> | 2021-07-05 10:20:10 +0200 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2021-07-30 17:19:18 +0200 |
| commit | 2d9a00705910ccea2dc5d9cba5469ff2de72fc87 (patch) | |
| tree | e0a0774883ccd86c9b8979a656b33ef3140a0e8d /drivers/usb/serial | |
| parent | USB: serial: io_edgeport: drop unused descriptor helper (diff) | |
| download | linux-2d9a00705910ccea2dc5d9cba5469ff2de72fc87.tar.xz linux-2d9a00705910ccea2dc5d9cba5469ff2de72fc87.zip | |
USB: serial: cp210x: fix control-characters error handling
In the unlikely event that setting the software flow-control characters
fails the other flow-control settings should still be updated (just like
all other terminal settings).
Move out the error message printed by the set_chars() helper to make it
more obvious that this is intentional.
Fixes: 7748feffcd80 ("USB: serial: cp210x: add support for software flow control")
Cc: stable@vger.kernel.org # 5.11
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial')
| -rw-r--r-- | drivers/usb/serial/cp210x.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index 3c80bfbf3bec..ad6aeb44f3e6 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c @@ -1164,10 +1164,8 @@ static int cp210x_set_chars(struct usb_serial_port *port, kfree(dmabuf); - if (result < 0) { - dev_err(&port->dev, "failed to set special chars: %d\n", result); + if (result < 0) return result; - } return 0; } @@ -1219,8 +1217,10 @@ static void cp210x_set_flow_control(struct tty_struct *tty, chars.bXoffChar = STOP_CHAR(tty); ret = cp210x_set_chars(port, &chars); - if (ret) - return; + if (ret) { + dev_err(&port->dev, "failed to set special chars: %d\n", + ret); + } } mutex_lock(&port_priv->mutex); |