diff options
| author | Johan Hovold <johan@kernel.org> | 2018-07-04 18:02:18 +0300 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2018-07-06 11:42:24 +0300 |
| commit | a420b5d939ee58f1d950f0ea782834056520aeaa (patch) | |
| tree | 2e61cc06b0d56fe2ab9d19e979bb2527060d7313 /drivers/usb | |
| parent | 1d1de580a3e0b1cfacd63b4093573d8f327b0a1a (diff) | |
| download | linux-a420b5d939ee58f1d950f0ea782834056520aeaa.tar.xz | |
USB: serial: kobil_sct: fix modem-status error handling
Make sure to return -EIO in case of a short modem-status read request.
While at it, split the debug message to not include the (zeroed)
transfer-buffer content in case of errors.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/serial/kobil_sct.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c index a31ea7e194dd..a6ebed1e0f20 100644 --- a/drivers/usb/serial/kobil_sct.c +++ b/drivers/usb/serial/kobil_sct.c @@ -393,12 +393,20 @@ static int kobil_tiocmget(struct tty_struct *tty) transfer_buffer_length, KOBIL_TIMEOUT); - dev_dbg(&port->dev, "%s - Send get_status_line_state URB returns: %i. Statusline: %02x\n", - __func__, result, transfer_buffer[0]); + dev_dbg(&port->dev, "Send get_status_line_state URB returns: %i\n", + result); + if (result < 1) { + if (result >= 0) + result = -EIO; + goto out_free; + } + + dev_dbg(&port->dev, "Statusline: %02x\n", transfer_buffer[0]); result = 0; if ((transfer_buffer[0] & SUSBCR_GSL_DSR) != 0) result = TIOCM_DSR; +out_free: kfree(transfer_buffer); return result; } |