[PATCH 3.10 083/250] USB: serial: ch341: fix open error handling

[Willy Tarreau]

From: Johan Hovold <jo...@kernel.org>

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 <jo...@kernel.org>
Signed-off-by: Willy Tarreau <w...@1wt.eu>
---
 drivers/usb/serial/ch341.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index 2272f4f..52ac5fd 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -315,15 +315,15 @@ 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;
 
        r = ch341_set_handshake(serial->dev, priv->line_control);
        if (r)
-               goto out;
+               return r;
 
        r = ch341_set_baudrate(serial->dev, priv);
        if (r)
-               goto out;
+               return r;
 
        dev_dbg(&port->dev, "%s - submitting interrupt urb", __func__);
        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)
                dev_err(&port->dev, "%s - failed submitting interrupt urb,"
                        " error %d\n", __func__, r);
                ch341_close(port);
-               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
-- 
2.8.0.rc2.1.gbe9624a