summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2010-10-21 10:49:10 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-22 10:22:19 -0700
commit92ca0dc5ee022e4c0e488177e1d8865a0778c6c2 (patch)
tree00e1220ec196088a564dc99e5f1adace06340dc6
parentf34c25ed78df6d1297db2187bf5e58aaf6674183 (diff)
downloadop-kernel-dev-92ca0dc5ee022e4c0e488177e1d8865a0778c6c2.zip
op-kernel-dev-92ca0dc5ee022e4c0e488177e1d8865a0778c6c2.tar.gz
USB: mct_u232: fix broken close
Fix regression introduced by commit f26788da3b342099d2b02d99ba1cb7f154d6ef7b (USB: serial: refactor generic close) which broke driver close(). This driver uses non-standard semantics for the read urb which makes the generic close function fail to kill it (the read urb is actually an interrupt urb and therefore bulk_in size is zero). Reported-by: Eric Shattow "Eprecocious" <lucent@gmail.com> Tested-by: Eric Shattow "Eprecocious" <lucent@gmail.com> Cc: stable <stable@kernel.org> Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/serial/mct_u232.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index 7aa01b9..2849f8c 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -549,9 +549,12 @@ static void mct_u232_close(struct usb_serial_port *port)
{
dbg("%s port %d", __func__, port->number);
- usb_serial_generic_close(port);
- if (port->serial->dev)
+ 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);
+ }
} /* mct_u232_close */
OpenPOWER on IntegriCloud