Commit 2d9a0070 authored Jul 05, 2021 by Johan Hovold

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: 7748feff ("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>

parent a311936b

drivers/usb/serial/cp210x.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -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);