mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-15 16:24:13 +08:00
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
parent
cd8db057e9
commit
b5fda434b1
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user