UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB: serial: ch341: fix open error handling 

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

Fixes: 664d5df92e ("USB: usb-serial ch341: support for DTR/RTS/CTS")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Johan Hovold 2017-01-06 19:15:13 +01:00
parent 030ee7ae52
commit f2950b7854
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/usb/serial/ch341.c
View File

@ -319,7 +319,7 @@ static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port)
r = ch341_configure(serial->dev, priv); r = ch341_configure(serial->dev, priv);
if (r) if (r)
goto out; return r;
if (tty) if (tty)
ch341_set_termios(tty, port, NULL); 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) { if (r) {
dev_err(&port->dev, "%s - failed to submit interrupt urb: %d\n", dev_err(&port->dev, "%s - failed to submit interrupt urb: %d\n",
__func__, r); __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;
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 /* Old_termios contains the original termios settings and