diff options
| author | Johan Hovold <jhovold@gmail.com> | 2012-10-25 10:29:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-25 09:36:58 -0700 |
| commit | 2f0295adf6438188c4cd0868f2b1976a2b034e1d (patch) | |
| tree | d9e1ee413e1bbaaf4b2e5e44d9b3fd79de3a4b86 /drivers/usb/serial/quatech2.c | |
| parent | 8e512ab0b675da20e023439a5811e3f2554e6852 (diff) | |
| download | linux-2f0295adf6438188c4cd0868f2b1976a2b034e1d.tar.gz linux-2f0295adf6438188c4cd0868f2b1976a2b034e1d.tar.bz2 linux-2f0295adf6438188c4cd0868f2b1976a2b034e1d.zip | |
USB: quatech2: 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>
Diffstat (limited to 'drivers/usb/serial/quatech2.c')
| -rw-r--r-- | drivers/usb/serial/quatech2.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/serial/quatech2.c b/drivers/usb/serial/quatech2.c index 7e8d8f32b634..ffcfc962ab10 100644 --- a/drivers/usb/serial/quatech2.c +++ b/drivers/usb/serial/quatech2.c @@ -427,6 +427,12 @@ static void qt2_close(struct usb_serial_port *port) port_priv->urb_in_use = false; spin_unlock_irqrestore(&port_priv->urb_lock, flags); + mutex_lock(&port->serial->disc_mutex); + if (port->serial->disconnected) { + mutex_unlock(&port->serial->disc_mutex); + return; + } + /* flush the port transmit buffer */ i = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), @@ -458,6 +464,7 @@ static void qt2_close(struct usb_serial_port *port) dev_err(&port->dev, "%s - close port failed %i\n", __func__, i); + mutex_unlock(&port->serial->disc_mutex); } static void qt2_disconnect(struct usb_serial *serial) |