remove queue-4.4/usb-serial-ch341-fix-resume-after-reset.patch

diff --git a/queue-4.4/series b/queue-4.4/series
index c5d1a44d2eb91809ea5acc20095c2ed30da23dc9..c7ad0a030635af7546b9d0d603c817bc53a1035c 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -16,7 +16,6 @@ kvm-x86-introduce-segmented_write_std.patch
 nl80211-fix-sched-scan-netlink-socket-owner-destruction.patch
 usb-serial-kl5kusb105-fix-line-state-error-handling.patch
 usb-serial-ch341-fix-initial-modem-control-state.patch
-usb-serial-ch341-fix-resume-after-reset.patch
 usb-serial-ch341-fix-open-error-handling.patch
 usb-serial-ch341-fix-control-message-error-handling.patch
 usb-serial-ch341-fix-open-and-resume-after-b0.patch

diff --git a/queue-4.4/usb-serial-ch341-fix-resume-after-reset.patch b/queue-4.4/usb-serial-ch341-fix-resume-after-reset.patch
deleted file mode 100644 (file)
index b68542a..0000000
--- a/queue-4.4/usb-serial-ch341-fix-resume-after-reset.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From ce5e292828117d1b71cbd3edf9e9137cf31acd30 Mon Sep 17 00:00:00 2001
-From: Johan Hovold <johan@kernel.org>
-Date: Fri, 6 Jan 2017 19:15:14 +0100
-Subject: USB: serial: ch341: fix resume after reset
-
-From: Johan Hovold <johan@kernel.org>
-
-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: 1ded7ea47b88 ("USB: ch341 serial: fix port number changed after resume")
-Fixes: 2bfd1c96a9fb ("USB: serial: ch341: remove reset_resume callback")
-Signed-off-by: Johan Hovold <johan@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/serial/ch341.c |   17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
---- a/drivers/usb/serial/ch341.c
-+++ b/drivers/usb/serial/ch341.c
-@@ -538,14 +538,23 @@ static int ch341_tiocmget(struct tty_str
- 
- static int ch341_reset_resume(struct usb_serial *serial)
- {
--      struct ch341_private *priv;
--
--      priv = usb_get_serial_port_data(serial->port[0]);
-+      struct usb_serial_port *port = serial->port[0];
-+      struct ch341_private *priv = usb_get_serial_port_data(port);
-+      int ret;
- 
-       /* reconfigure ch341 serial port after bus-reset */
-       ch341_configure(serial->dev, priv);
- 
--      return 0;
-+      if (tty_port_initialized(&port->port)) {
-+              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 = {