USB: serial: cp210x: fix control-characters error handling

commit 2d9a00705910ccea2dc5d9cba5469ff2de72fc87 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index ea2e2d925a96006d515cf30702a4f1f8027bbf3c..6eb4a282cf368e68a267415dea7449df161b6d85 100644 (file)
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -1110,10 +1110,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;
 }
@@ -1165,8 +1163,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);