GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-16 03:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

USB: serial: pl2303: fix line-setting error handling

Browse source 
Make sure to return an error on zero-length transfers when retrieving
the line settings even if the driver currently ignores the return value.

Also remove a redundant check for short transfer when setting the line
settings.

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Johan Hovold 2017-01-12 14:56:19 +01:00
parent cd8db057e9
commit b5fda434b1
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/usb/serial/pl2303.c
View file

@ -449,7 +449,7 @@ static int pl2303_get_line_request(struct usb_serial_port *port,
if (ret != 7) { if (ret != 7) {
dev_err(&port->dev, "%s - failed: %d\n", __func__, ret); dev_err(&port->dev, "%s - failed: %d\n", __func__, ret);
if (ret > 0) if (ret >= 0)
ret = -EIO; ret = -EIO;
return ret; return ret;
@ -469,12 +469,8 @@ static int pl2303_set_line_request(struct usb_serial_port *port,
ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
SET_LINE_REQUEST, SET_LINE_REQUEST_TYPE, SET_LINE_REQUEST, SET_LINE_REQUEST_TYPE,
0, 0, buf, 7, 100); 0, 0, buf, 7, 100);
if (ret != 7) { if (ret < 0) {
dev_err(&port->dev, "%s - failed: %d\n", __func__, ret); dev_err(&port->dev, "%s - failed: %d\n", __func__, ret);
if (ret > 0)
ret = -EIO;
return ret; return ret;
} }