diff options
| author | Johan Hovold <jhovold@gmail.com> | 2012-10-25 10:29:14 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-25 09:37:09 -0700 |
| commit | 5260e458f5eff269a43e4f1e9c47186c57b88ddb (patch) | |
| tree | 26dc3f70cc7590688a2fd7680535271b6cf025f2 /drivers/usb | |
| parent | a8f2ae7a3aa59079d7e7e1ddf5007f03532f458c (diff) | |
| download | linux-3.10-5260e458f5eff269a43e4f1e9c47186c57b88ddb.tar.gz linux-3.10-5260e458f5eff269a43e4f1e9c47186c57b88ddb.tar.bz2 linux-3.10-5260e458f5eff269a43e4f1e9c47186c57b88ddb.zip | |
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.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c index a8bce134ffb..8a208100410 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) static void mct_u232_close(struct usb_serial_port *port) { - 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 */ |