Commit b5fda434 authored by Johan Hovold's avatar Johan Hovold

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

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent cd8db057
...@@ -449,7 +449,7 @@ static int pl2303_get_line_request(struct usb_serial_port *port, ...@@ -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, ...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment