Commit e430ae1f authored by Johan Hovold's avatar Johan Hovold Committed by Jiri Slaby

USB: serial: ch341: fix open error handling

commit f2950b78 upstream.

Make sure to stop the interrupt URB before returning on errors during
open.

Fixes: 664d5df9 ("USB: usb-serial ch341: support for DTR/RTS/CTS")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
parent 08d5a8b6
...@@ -315,15 +315,15 @@ static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port) ...@@ -315,15 +315,15 @@ static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port)
r = ch341_configure(serial->dev, priv); r = ch341_configure(serial->dev, priv);
if (r) if (r)
goto out; return r;
r = ch341_set_handshake(serial->dev, priv->line_control); r = ch341_set_handshake(serial->dev, priv->line_control);
if (r) if (r)
goto out; return r;
r = ch341_set_baudrate(serial->dev, priv); r = ch341_set_baudrate(serial->dev, priv);
if (r) if (r)
goto out; return r;
dev_dbg(&port->dev, "%s - submitting interrupt urb", __func__); dev_dbg(&port->dev, "%s - submitting interrupt urb", __func__);
r = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); r = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
...@@ -331,12 +331,19 @@ static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port) ...@@ -331,12 +331,19 @@ static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port)
dev_err(&port->dev, "%s - failed submitting interrupt urb," dev_err(&port->dev, "%s - failed submitting interrupt urb,"
" error %d\n", __func__, r); " error %d\n", __func__, r);
ch341_close(port); ch341_close(port);
goto out; return r;
} }
r = usb_serial_generic_open(tty, port); r = usb_serial_generic_open(tty, port);
if (r)
goto err_kill_interrupt_urb;
return 0;
out: return r; err_kill_interrupt_urb:
usb_kill_urb(port->interrupt_in_urb);
return r;
} }
/* Old_termios contains the original termios settings and /* Old_termios contains the original termios settings and
......
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