evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

USB: serial: ch341: fix resume after reset

Browse source 
commit ce5e292828117d1b71cbd3edf9e9137cf31acd30 upstream.

Fix reset-resume handling which failed to resubmit the read and
interrupt URBs, thereby leaving a port that was open before suspend in a
broken state until closed and reopened.

Fixes: 1ded7ea47b ("USB: ch341 serial: fix port number changed after
resume")
Fixes: 2bfd1c96a9 ("USB: serial: ch341: remove reset_resume callback")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2017-01-06 19:15:14 +01:00 • committed by Greg Kroah-Hartman
parent a1a0612b7d
commit 1d25a05642
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/usb/serial/ch341.c
View file

@ -554,14 +554,23 @@ static int ch341_tiocmget(struct tty_struct *tty)
static int ch341_reset_resume(struct usb_serial *serial) static int ch341_reset_resume(struct usb_serial *serial)
{ {
struct ch341_private *priv; struct usb_serial_port *port = serial->port[0];
struct ch341_private *priv = usb_get_serial_port_data(port);
priv = usb_get_serial_port_data(serial->port[0]); int ret;
/* reconfigure ch341 serial port after bus-reset */ /* reconfigure ch341 serial port after bus-reset */
ch341_configure(serial->dev, priv); ch341_configure(serial->dev, priv);
return 0; if (test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
ret = usb_submit_urb(port->interrupt_in_urb, GFP_NOIO);
if (ret) {
dev_err(&port->dev, "failed to submit interrupt urb: %d\n",
ret);
return ret;
}
}
return usb_serial_generic_resume(serial);
} }
static struct usb_serial_driver ch341_device = { static struct usb_serial_driver ch341_device = {