From patchwork Tue Nov 27 16:15:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [245/270] USB: mct_u232: fix broken close Date: Tue, 27 Nov 2012 06:15:51 -0000 From: Ben Hutchings X-Patchwork-Id: 202257 Message-Id: <1354032951.4266.61.camel@deadeye.wl.decadent.org.uk> To: Greg Kroah-Hartman Cc: Greg Kroah-Hartman , Johan Hovold , linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com On Mon, 2012-11-26 at 14:58 -0200, Herton Ronaldo Krzesinski wrote: > 3.5.7u1 -stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Johan Hovold > > commit 5260e458f5eff269a43e4f1e9c47186c57b88ddb upstream. > > Make sure generic close is called at close. > > The driver relies on the generic write implementation but did not call > generic close. > > Note that the call to kill the read urb is not redundant, as mct_u232 > uses an interrupt urb from the second port as the read urb and that > generic close therefore fails to kill it. > > Compile-only tested. > > Signed-off-by: Johan Hovold > Signed-off-by: Greg Kroah-Hartman > Signed-off-by: Herton Ronaldo Krzesinski [...] This is missing on 3.4; the version I used for 3.2 (attached) should be applicable. Ben. From: Johan Hovold Date: Thu, 25 Oct 2012 10:29:14 +0200 Subject: USB: mct_u232: fix broken close commit 5260e458f5eff269a43e4f1e9c47186c57b88ddb upstream. Make sure generic close is called at close. The driver relies on the generic write implementation but did not call generic close. Note that the call to kill the read urb is not redundant, as mct_u232 uses an interrupt urb from the second port as the read urb and that generic close therefore fails to kill it. Compile-only tested. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings --- drivers/usb/serial/mct_u232.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) --- a/drivers/usb/serial/mct_u232.c +++ b/drivers/usb/serial/mct_u232.c @@ -577,12 +577,14 @@ static void mct_u232_close(struct usb_se { dbg("%s port %d", __func__, port->number); - if (port->serial->dev) { - /* shutdown our urbs */ - usb_kill_urb(port->write_urb); - usb_kill_urb(port->read_urb); - usb_kill_urb(port->interrupt_in_urb); - } + /* + * Must kill the read urb as it is actually an interrupt urb, which + * generic close thus fails to kill. + */ + usb_kill_urb(port->read_urb); + usb_kill_urb(port->interrupt_in_urb); + + usb_serial_generic_close(port); } /* mct_u232_close */