summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2011-11-10 17:38:13 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-15 19:47:41 +0100
commit3827d8762febd68ff1b6db0bb5efa55bfbccaeb4 (patch)
tree1103c4e441d74776e0949399d01e11746aa58a88
parentUSB: move usb_translate_errors to linux/usb.h (diff)
downloadlinux-3827d8762febd68ff1b6db0bb5efa55bfbccaeb4.tar.xz
linux-3827d8762febd68ff1b6db0bb5efa55bfbccaeb4.zip
USB: serial: do not forward USB specific errors in open
Use usb_translate_errors() to map USB-specific errors to errors appropriate for user space (ENOMEM, ENODEV and EIO) in open. Currently almost all serial drivers simply forward error codes from the stack (e.g. from usb_submit_urb()), but these codes often have different meanings in user-space. Doing the mapping in usb-serial core simplifies driver code and allows for more consistent error reporting. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/serial/usb-serial.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 8d5190f3d8eb..a2a0574b662a 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -260,6 +260,10 @@ static int serial_activate(struct tty_port *tport, struct tty_struct *tty)
else
retval = port->serial->type->open(tty, port);
mutex_unlock(&serial->disc_mutex);
+
+ if (retval < 0)
+ retval = usb_translate_errors(retval);
+
return retval;
}