forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

USB: metro-usb: fix io after disconnect

Browse source 
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 • committed by Greg Kroah-Hartman
commit 2ee44fbeac
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
drivers/usb/serial/metro-usb.c
View file

@ -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);
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)