aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/serial/cp210x.c
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2012-01-16 00:36:48 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-24 11:37:53 -0800
commit55b2afbb92ad92e9f6b0aa4354eb1c94589280c3 (patch)
tree41db1cac507028a166547365730b7b310769864d /drivers/usb/serial/cp210x.c
parent791b7d7cf69de11275e4dccec2f538eec02cbff6 (diff)
downloadlinux-stericsson-55b2afbb92ad92e9f6b0aa4354eb1c94589280c3.tar.gz
USB: cp210x: call generic open last in open
Make sure port is fully initialised before calling generic open. Signed-off-by: Johan Hovold <jhovold@gmail.com> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/cp210x.c')
-rw-r--r--drivers/usb/serial/cp210x.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index c2b5d4a09b16..bb4290bfe59d 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -410,13 +410,10 @@ static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port)
return result;
}
- result = usb_serial_generic_open(tty, port);
- if (result)
- return result;
-
/* Configure the termios structure */
cp210x_get_termios(tty, port);
- return 0;
+
+ return usb_serial_generic_open(tty, port);
}
static void cp210x_close(struct usb_serial_port *port)