aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2012-10-25 04:29:14 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-25 12:37:09 -0400
commit5260e458f5eff269a43e4f1e9c47186c57b88ddb (patch)
tree26dc3f70cc7590688a2fd7680535271b6cf025f2 /drivers/usb
parenta8f2ae7a3aa59079d7e7e1ddf5007f03532f458c (diff)
USB: mct_u232: fix broken close
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. Cc: <stable@vger.kernel.org> Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/serial/mct_u232.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index a8bce134ffba..8a2081004107 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -520,12 +520,14 @@ static void mct_u232_dtr_rts(struct usb_serial_port *port, int on)
520 520
521static void mct_u232_close(struct usb_serial_port *port) 521static void mct_u232_close(struct usb_serial_port *port)
522{ 522{
523 if (port->serial->dev) { 523 /*
524 /* shutdown our urbs */ 524 * Must kill the read urb as it is actually an interrupt urb, which
525 usb_kill_urb(port->write_urb); 525 * generic close thus fails to kill.
526 usb_kill_urb(port->read_urb); 526 */
527 usb_kill_urb(port->interrupt_in_urb); 527 usb_kill_urb(port->read_urb);
528 } 528 usb_kill_urb(port->interrupt_in_urb);
529
530 usb_serial_generic_close(port);
529} /* mct_u232_close */ 531} /* mct_u232_close */
530 532
531 533