Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / usb / serial / mct_u232.c

diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index 7aa01b95b1d45fce870ec7b1c7a419185ae5aeef..2849f8c320157e483504962b3ec16b13a0a4bd45 100644 (file)
--- 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 */