summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-03-21 12:37:42 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-25 13:54:31 -0700
commit94c51dca2ce9a3dd0c52ec6f57df4fb3e81e3ec7 (patch)
tree111fa9a2a12db34e900fc9d7172c093c3cca4f0e
parentcf41aa9e19052d467b54786090e1d3ba9104e394 (diff)
downloadop-kernel-dev-94c51dca2ce9a3dd0c52ec6f57df4fb3e81e3ec7.zip
op-kernel-dev-94c51dca2ce9a3dd0c52ec6f57df4fb3e81e3ec7.tar.gz
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>
-rw-r--r--drivers/usb/serial/opticon.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index e13e1a4..6af5bb8 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;
OpenPOWER on IntegriCloud