USB: ftdi_sio: fix tiocmget and tiocmset return values

Make sure we do not return USB-internal error codes to userspace.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 2ad5e7c7f226..987cc2cafa3b 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1091,6 +1091,7 @@ static int update_mctrl(struct usb_serial_port *port, unsigned int set,
                         __func__,
                         (set & TIOCM_DTR) ? "HIGH" : (clear & TIOCM_DTR) ? "LOW" : "unchanged",
                         (set & TIOCM_RTS) ? "HIGH" : (clear & TIOCM_RTS) ? "LOW" : "unchanged");
+                rv = usb_translate_errors(rv);
         } else {
                 dev_dbg(dev, "%s - DTR %s, RTS %s\n", __func__,
                         (set & TIOCM_DTR) ? "HIGH" : (clear & TIOCM_DTR) ? "LOW" : "unchanged",
@@ -2369,8 +2370,10 @@ static int ftdi_tiocmget(struct tty_struct *tty)
                         FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE,
                         0, priv->interface,
                         buf, len, WDR_TIMEOUT);
-        if (ret < 0)
+        if (ret < 0) {
+                ret = usb_translate_errors(ret);
                 goto out;
+        }
 
         ret =   (buf[0] & FTDI_SIO_DSR_MASK  ? TIOCM_DSR : 0) |
                 (buf[0] & FTDI_SIO_CTS_MASK  ? TIOCM_CTS : 0) |