From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-f68.google.com ([209.85.215.68]:32921 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031083AbdAFSPm (ORCPT ); Fri, 6 Jan 2017 13:15:42 -0500 From: Johan Hovold To: linux-usb@vger.kernel.org Cc: Aidan Thornton , Grigori Goronzy , Karl Palsson , Russell Senior , Eddi De Pieri , Johan Hovold , stable Subject: [PATCH v2 04/14] USB: serial: ch341: fix open error handling Date: Fri, 6 Jan 2017 19:15:13 +0100 Message-Id: <20170106181523.21324-5-johan@kernel.org> In-Reply-To: <20170106181523.21324-1-johan@kernel.org> References: <20170106181523.21324-1-johan@kernel.org> Sender: stable-owner@vger.kernel.org List-ID: Make sure to stop the interrupt URB before returning on errors during open. Fixes: 664d5df92e88 ("USB: usb-serial ch341: support for DTR/RTS/CTS") Cc: stable Signed-off-by: Johan Hovold --- drivers/usb/serial/ch341.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index 0cc5056b304d..8f41d4385f1c 100644 --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c @@ -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; + + 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 -- 2.10.2