korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-15 06:55:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: 7748feffcd ("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>
This commit is contained in:
Johan Hovold 2021-07-05 10:20:10 +02:00
parent a311936b5b
commit 2d9a007059
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/usb/serial/cp210x.c
View File

@ -1164,10 +1164,8 @@ static int cp210x_set_chars(struct usb_serial_port *port,
kfree(dmabuf); kfree(dmabuf);
if (result < 0) { if (result < 0)
dev_err(&port->dev, "failed to set special chars: %d\n", result);
return result; return result;
}
return 0; return 0;
} }
@ -1219,8 +1217,10 @@ static void cp210x_set_flow_control(struct tty_struct *tty,
chars.bXoffChar = STOP_CHAR(tty); chars.bXoffChar = STOP_CHAR(tty);
ret = cp210x_set_chars(port, &chars); ret = cp210x_set_chars(port, &chars);
if (ret) if (ret) {
return; dev_err(&port->dev, "failed to set special chars: %d\n",
ret);
}
} }
mutex_lock(&port_priv->mutex); mutex_lock(&port_priv->mutex);