| From 39712e8bfa8d3aa6ce1e60fc9d62c9b076c17a30 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Thu, 12 Jan 2017 14:56:23 +0100 |
| Subject: [PATCH] USB: serial: ti_usb_3410_5052: fix control-message error |
| handling |
| |
| commit 39712e8bfa8d3aa6ce1e60fc9d62c9b076c17a30 upstream. |
| |
| 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: 1da177e4c3f4 ("Linux-2.6.12-rc2") |
| Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Johan Hovold <johan@kernel.org> |
| |
| diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c |
| index 64b85b8dedf3..3107bf5d1c96 100644 |
| --- a/drivers/usb/serial/ti_usb_3410_5052.c |
| +++ b/drivers/usb/serial/ti_usb_3410_5052.c |
| @@ -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), |
| value, moduleid, data, size, 1000); |
| |
| - if (status == size) |
| - status = 0; |
| - |
| - if (status > 0) |
| - status = -ECOMM; |
| + if (status < 0) |
| + return status; |
| |
| - return status; |
| + return 0; |
| } |
| |
| |
| @@ -1575,8 +1572,7 @@ static int ti_command_in_sync(struct ti_device *tdev, __u8 command, |
| |
| if (status == size) |
| status = 0; |
| - |
| - if (status > 0) |
| + else if (status >= 0) |
| status = -ECOMM; |
| |
| return status; |
| -- |
| 2.12.0 |
| |