Commit 2ee44fbe authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

USB: metro-usb: fix io after disconnect

Make sure no control urb is submitted during close after a disconnect by
checking the disconnected flag.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 50dde868
...@@ -179,16 +179,13 @@ static void metrousb_cleanup(struct usb_serial_port *port) ...@@ -179,16 +179,13 @@ static void metrousb_cleanup(struct usb_serial_port *port)
{ {
dev_dbg(&port->dev, "%s\n", __func__); dev_dbg(&port->dev, "%s\n", __func__);
if (port->serial->dev) { usb_unlink_urb(port->interrupt_in_urb);
/* Shutdown any interrupt in urbs. */ usb_kill_urb(port->interrupt_in_urb);
if (port->interrupt_in_urb) {
usb_unlink_urb(port->interrupt_in_urb); mutex_lock(&port->serial->disc_mutex);
usb_kill_urb(port->interrupt_in_urb); if (!port->serial->disconnected)
}
/* Send deactivate cmd to device */
metrousb_send_unidirectional_cmd(UNI_CMD_CLOSE, port); metrousb_send_unidirectional_cmd(UNI_CMD_CLOSE, port);
} mutex_unlock(&port->serial->disc_mutex);
} }
static int metrousb_open(struct tty_struct *tty, struct usb_serial_port *port) static int metrousb_open(struct tty_struct *tty, struct usb_serial_port *port)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment