diff options
| author | Johan Hovold <johan@kernel.org> | 2017-01-06 19:15:13 +0100 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2017-01-09 14:55:38 +0100 |
| commit | f2950b78547ffb8475297ada6b92bc2d774d5461 (patch) | |
| tree | 59e72b647441540b647a4571d091e3407e62d37d | |
| parent | 030ee7ae52a46a2be52ccc8242c4a330aba8d38e (diff) | |
| download | op-kernel-dev-f2950b78547ffb8475297ada6b92bc2d774d5461.zip op-kernel-dev-f2950b78547ffb8475297ada6b92bc2d774d5461.tar.gz | |
USB: serial: ch341: fix open error handling
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 <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
| -rw-r--r-- | drivers/usb/serial/ch341.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index 0cc5056..8f41d43 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 |
