USB: serial: ch341: fix open error handling

commit f2950b78547ffb8475297ada6b92bc2d774d5461 upstream.

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

Fixes: 664d5df92e88 ("USB: usb-serial ch341: support for DTR/RTS/CTS")
Signed-off-by: Johan Hovold <johan@kernel.org>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index e138f3c..3a08dc3 100644 (file)
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -327,7 +327,7 @@ static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port)
 
        r = ch341_configure(serial->dev, priv);
        if (r)
 
        r = ch341_configure(serial->dev, priv);
        if (r)

-               goto out;
+               return r;

 
        if (tty)
                ch341_set_termios(tty, port, NULL);
 
        if (tty)
                ch341_set_termios(tty, port, NULL);


@@ -338,12 +338,19 @@ static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port)
        if (r) {
                dev_err(&port->dev, "%s - failed submitting interrupt urb,"
                        " error %d\n", __func__, r);
        if (r) {
                dev_err(&port->dev, "%s - failed submitting interrupt urb,"
                        " error %d\n", __func__, r);

-               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;
+
+err_kill_interrupt_urb:
+       usb_kill_urb(port->interrupt_in_urb);

 
 

-out:   return r;
+       return r;

 }
 
 /* Old_termios contains the original termios settings and
 }
 
 /* Old_termios contains the original termios settings and