Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2950b78 authored by Johan Hovold's avatar Johan Hovold
Browse files

USB: serial: ch341: fix open error handling 



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

Fixes: 664d5df9 ("USB: usb-serial ch341: support for DTR/RTS/CTS")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 030ee7ae

drivers/usb/serial/ch341.c

+10 −3
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port) 


	r = ch341_configure(serial->dev, priv);

	if (r)

		goto out;

		return r;



	if (tty)

		ch341_set_termios(tty, port, NULL);
@@ -329,12 +329,19 @@ static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port) 
	if (r) {

		dev_err(&port->dev, "%s - failed to submit interrupt urb: %d\n",

			__func__, r);

		goto out;

		return r;

	}



	r = usb_serial_generic_open(tty, port);

	if (r)

		goto err_kill_interrupt_urb;



out:	return r;

	return 0;



err_kill_interrupt_urb:

	usb_kill_urb(port->interrupt_in_urb);



	return r;

}



/* Old_termios contains the original termios settings and