USB: serial: ti_usb_3410_5052: fix control-message error handling
Make sure to detect and return an error on zero-length control-message
transfers when reading from the device.
This addresses a potential failure to detect an empty transmit buffer
during close.
Also remove a redundant check for short transfer when sending a command.
Fixes: 1da177e4c3
("Linux-2.6.12-rc2")
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Родитель
1eac5c244f
Коммит
39712e8bfa
|
@ -1553,13 +1553,10 @@ static int ti_command_out_sync(struct ti_device *tdev, __u8 command,
|
||||||
(USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT),
|
(USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT),
|
||||||
value, moduleid, data, size, 1000);
|
value, moduleid, data, size, 1000);
|
||||||
|
|
||||||
if (status == size)
|
if (status < 0)
|
||||||
status = 0;
|
return status;
|
||||||
|
|
||||||
if (status > 0)
|
return 0;
|
||||||
status = -ECOMM;
|
|
||||||
|
|
||||||
return status;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1575,8 +1572,7 @@ static int ti_command_in_sync(struct ti_device *tdev, __u8 command,
|
||||||
|
|
||||||
if (status == size)
|
if (status == size)
|
||||||
status = 0;
|
status = 0;
|
||||||
|
else if (status >= 0)
|
||||||
if (status > 0)
|
|
||||||
status = -ECOMM;
|
status = -ECOMM;
|
||||||
|
|
||||||
return status;
|
return status;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче