Commit 80ffa031 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

USB: cp210x: call generic open last in open

commit 55b2afbb upstream.

Make sure port is fully initialised before calling generic open.
Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9bf2add8
...@@ -393,8 +393,6 @@ static unsigned int cp210x_quantise_baudrate(unsigned int baud) { ...@@ -393,8 +393,6 @@ static unsigned int cp210x_quantise_baudrate(unsigned int baud) {
static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port) static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port)
{ {
int result;
dbg("%s - port %d", __func__, port->number); dbg("%s - port %d", __func__, port->number);
if (cp210x_set_config_single(port, CP210X_IFC_ENABLE, UART_ENABLE)) { if (cp210x_set_config_single(port, CP210X_IFC_ENABLE, UART_ENABLE)) {
...@@ -403,13 +401,10 @@ static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port) ...@@ -403,13 +401,10 @@ static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port)
return -EPROTO; return -EPROTO;
} }
result = usb_serial_generic_open(tty, port);
if (result)
return result;
/* Configure the termios structure */ /* Configure the termios structure */
cp210x_get_termios(tty, port); cp210x_get_termios(tty, port);
return 0;
return usb_serial_generic_open(tty, port);
} }
static void cp210x_close(struct usb_serial_port *port) static void cp210x_close(struct usb_serial_port *port)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment