Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c2ee545 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: ftdi_sio: fix tiocmget and tiocmset return values 



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

Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fef0b828

drivers/usb/serial/ftdi_sio.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -1091,6 +1091,7 @@ static int update_mctrl(struct usb_serial_port *port, unsigned int set, 
			__func__,

			__func__,

			(set & TIOCM_DTR) ? "HIGH" : (clear & TIOCM_DTR) ? "LOW" : "unchanged",

			(set & TIOCM_DTR) ? "HIGH" : (clear & TIOCM_DTR) ? "LOW" : "unchanged",

			(set & TIOCM_RTS) ? "HIGH" : (clear & TIOCM_RTS) ? "LOW" : "unchanged");

			(set & TIOCM_RTS) ? "HIGH" : (clear & TIOCM_RTS) ? "LOW" : "unchanged");

		rv = usb_translate_errors(rv);

	} else {

	} else {

		dev_dbg(dev, "%s - DTR %s, RTS %s\n", __func__,

		dev_dbg(dev, "%s - DTR %s, RTS %s\n", __func__,

			(set & TIOCM_DTR) ? "HIGH" : (clear & TIOCM_DTR) ? "LOW" : "unchanged",

			(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,

			FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE,

			0, priv->interface,

			0, priv->interface,

			buf, len, WDR_TIMEOUT);

			buf, len, WDR_TIMEOUT);

	if (ret < 0)

	if (ret < 0) {

		ret = usb_translate_errors(ret);

		goto out;

		goto out;

	}





	ret =	(buf[0] & FTDI_SIO_DSR_MASK  ? TIOCM_DSR : 0) |

	ret =	(buf[0] & FTDI_SIO_DSR_MASK  ? TIOCM_DSR : 0) |

		(buf[0] & FTDI_SIO_CTS_MASK  ? TIOCM_CTS : 0) |

		(buf[0] & FTDI_SIO_CTS_MASK  ? TIOCM_CTS : 0) |