Skip to content

Commit

Permalink
USB: serial: pl2303: fix line-setting error handling
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Johan Hovold <[email protected]>
jhovold committed Jan 16, 2017
1 parent cd8db05 commit b5fda43
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/usb/serial/pl2303.c
Original file line number Diff line number Diff line change
@@ -449,7 +449,7 @@ static int pl2303_get_line_request(struct usb_serial_port *port,
if (ret != 7) {
dev_err(&port->dev, "%s - failed: %d\n", __func__, ret);

if (ret > 0)
if (ret >= 0)
ret = -EIO;

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),
SET_LINE_REQUEST, SET_LINE_REQUEST_TYPE,
0, 0, buf, 7, 100);
if (ret != 7) {
if (ret < 0) {
dev_err(&port->dev, "%s - failed: %d\n", __func__, ret);

if (ret > 0)
ret = -EIO;

return ret;
}

0 comments on commit b5fda43

Please sign in to comment.