From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934172AbdCJLxp (ORCPT ); Fri, 10 Mar 2017 06:53:45 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:44381 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935768AbdCJLxa (ORCPT ); Fri, 10 Mar 2017 06:53:30 -0500 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Johan Hovold" Date: Fri, 10 Mar 2017 11:46:10 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.2 100/199] USB: serial: ch341: fix resume after reset In-Reply-To: X-SA-Exim-Connect-IP: 82.70.136.246 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.2.87-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold 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 [bwh: Backported to 3.2: - Move initialisation of 'serial' up to make this work - Delete the call to usb_serial_resume() that was still present and would be redundant with usb_serial_generic_resume() - Open-code tty_port_initialized()] Signed-off-by: Ben Hutchings --- --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c @@ -621,18 +621,24 @@ static int ch341_tiocmget(struct tty_str static int ch341_reset_resume(struct usb_interface *intf) { struct usb_device *dev = interface_to_usbdev(intf); - struct usb_serial *serial = NULL; - struct ch341_private *priv; - - serial = usb_get_intfdata(intf); - priv = usb_get_serial_port_data(serial->port[0]); + struct usb_serial *serial = usb_get_intfdata(intf); + 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(dev, priv); - usb_serial_resume(intf); + if (port->port.flags & ASYNC_INITIALIZED) { + 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 0; + return usb_serial_generic_resume(serial); } static struct usb_driver ch341_driver = {