Skip to content

Commit

Permalink
USB: serial: cp210x: fix control-characters error handling
Browse files Browse the repository at this point in the history
commit 2d9a007 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: 7748fef ("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>
  • Loading branch information
jhovold authored and gregkh committed Sep 8, 2021
1 parent 8c3084b commit 363715a
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/usb/serial/cp210x.c
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 363715a

Please sign in to comment.