From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-f68.google.com ([209.85.215.68]:36345 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751261AbdAQOWG (ORCPT ); Tue, 17 Jan 2017 09:22:06 -0500 Date: Tue, 17 Jan 2017 15:22:05 +0100 From: Johan Hovold To: gregkh@linuxfoundation.org Cc: johan@kernel.org, stable@vger.kernel.org, stable-commits@vger.kernel.org Subject: Re: Patch "USB: serial: ch341: fix resume after reset" has been added to the 4.4-stable tree Message-ID: <20170117142205.GB4040@localhost> References: <1484658281245153@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1484658281245153@kroah.com> Sender: stable-owner@vger.kernel.org List-ID: On Tue, Jan 17, 2017 at 02:04:41PM +0100, Greg Kroah-Hartman wrote: > > This is a note to let you know that I've just added the patch titled > > USB: serial: ch341: fix resume after reset > > to the 4.4-stable tree which can be found at: > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > The filename of the patch is: > usb-serial-ch341-fix-resume-after-reset.patch > and it can be found in the queue-4.4 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let know about it. > > > From ce5e292828117d1b71cbd3edf9e9137cf31acd30 Mon Sep 17 00:00:00 2001 > From: Johan Hovold > Date: Fri, 6 Jan 2017 19:15:14 +0100 > Subject: USB: serial: ch341: fix resume after reset > > 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 > Signed-off-by: Greg Kroah-Hartman > > --- > 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)) { Note that this needs to be if (test_bit(ASYNCB_INITIALIZED, &port->port.flags)) prior to commit d41861ca19c9 ("tty: Replace ASYNC_INITIALIZED bit and update atomically") that went into 4.7. I'll send a backport. Johan