aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2012-10-25 10:29:09 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-31 10:10:16 -0700
commitf5c21b3815667aeae65a3ec56576294c5ed751e6 (patch)
treebbcacc705bad0f13740bfb5b45ecf568ee46924f
parentb7e9cee3e7062435521dd933ce2349a2d721e596 (diff)
downloadlinux-linaro-stable-f5c21b3815667aeae65a3ec56576294c5ed751e6.tar.gz
USB: quatech2: fix close and disconnect urb handling
commit 8e512ab0b675da20e023439a5811e3f2554e6852 upstream. Kill urbs unconditionally at close and disconnect. Note that URB status is not valid outside of completion handler. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/quatech2.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/serial/quatech2.c b/drivers/usb/serial/quatech2.c
index e87cd59daa0a..e2c5b69c7eef 100644
--- a/drivers/usb/serial/quatech2.c
+++ b/drivers/usb/serial/quatech2.c
@@ -425,8 +425,7 @@ static void qt2_close(struct usb_serial_port *port)
port_priv->is_open = false;
spin_lock_irqsave(&port_priv->urb_lock, flags);
- if (port_priv->write_urb->status == -EINPROGRESS)
- usb_kill_urb(port_priv->write_urb);
+ usb_kill_urb(port_priv->write_urb);
port_priv->urb_in_use = false;
spin_unlock_irqrestore(&port_priv->urb_lock, flags);
@@ -467,8 +466,7 @@ static void qt2_disconnect(struct usb_serial *serial)
{
struct qt2_serial_private *serial_priv = usb_get_serial_data(serial);
- if (serial_priv->read_urb->status == -EINPROGRESS)
- usb_kill_urb(serial_priv->read_urb);
+ usb_kill_urb(serial_priv->read_urb);
}
static int get_serial_info(struct usb_serial_port *port,