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: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2012-10-25 10:29:00 +02:00 коммит произвёл Greg Kroah-Hartman
Родитель 50dde8686e
Коммит 2ee44fbeac
1 изменённых файлов: 5 добавлений и 8 удалений

Просмотреть файл

@ -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) {
/* Shutdown any interrupt in urbs. */
if (port->interrupt_in_urb) {
usb_unlink_urb(port->interrupt_in_urb); usb_unlink_urb(port->interrupt_in_urb);
usb_kill_urb(port->interrupt_in_urb); usb_kill_urb(port->interrupt_in_urb);
}
/* Send deactivate cmd to device */ mutex_lock(&port->serial->disc_mutex);
if (!port->serial->disconnected)
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)