From: Johan Hovold <jhovold@gmail.com>
Date: Thu, 21 Mar 2013 11:37:42 +0000 (+0100)
Subject: USB: opticon: fix return value of tiocmset
X-Git-Tag: firefly_0821_release~3680^2~672^2~124
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=94c51dca2ce9a3dd0c52ec6f57df4fb3e81e3ec7;p=firefly-linux-kernel-4.4.55.git

USB: opticon: fix return value of tiocmset

Make sure we return 0 or a negative error number appropriate for
userspace on errors.

Currently 1 rather than 0 is returned on successful operation.

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

diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index e13e1a4d3e1e..6af5bb810062 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -120,7 +120,10 @@ static int send_control_msg(struct usb_serial_port *port, u8 requesttype,
 				0, 0, buffer, 1, 0);
 	kfree(buffer);
 
-	return retval;
+	if (retval < 0)
+		return retval;
+
+	return 0;
 }
 
 static int opticon_open(struct tty_struct *tty, struct usb_serial_port *port)
@@ -329,10 +332,13 @@ static int opticon_tiocmset(struct tty_struct *tty,
 
 	/* Send the new RTS state to the connected device */
 	mutex_lock(&serial->disc_mutex);
-	if (!serial->disconnected)
+	if (!serial->disconnected) {
 		ret = send_control_msg(port, CONTROL_RTS, !rts);
-	else
+		if (ret)
+			ret = usb_translate_errors(ret);
+	} else {
 		ret = -ENODEV;
+	}
 	mutex_unlock(&serial->disc_mutex);
 
 	return ret;