diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-05 17:41:16 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-05 17:41:16 +0100 |
| commit | c8d204b38a558d74fafb6915e2593602b7f4b823 (patch) | |
| tree | d4e076845e4d6dfbef70b1f4740e8fa246958059 /drivers/usb/serial/quatech2.c | |
| parent | 29fc1aa454d0603493b47a8e2410ae6e9ab20258 (diff) | |
| parent | ef079936d3cd09e63612834fe2698eeada0d8e3f (diff) | |
| download | op-kernel-dev-c8d204b38a558d74fafb6915e2593602b7f4b823.zip op-kernel-dev-c8d204b38a558d74fafb6915e2593602b7f4b823.tar.gz | |
Merge tag 'usb-serial-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for v4.10-rc3
These fixes address a number of long-standing issues in various
USB-serial drivers which would lead to crashes should a malicious device
lack the expected endpoints.
Included are also a few related fixes, and a couple of unrelated ones
that were found during my survey (e.g. a memleak and a
sleep-while-atomic).
A compiler warning revealed an error-handling issue in the new f81534
driver which is also fixed.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/quatech2.c')
| -rw-r--r-- | drivers/usb/serial/quatech2.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/serial/quatech2.c b/drivers/usb/serial/quatech2.c index 659cb86..5709cc9 100644 --- a/drivers/usb/serial/quatech2.c +++ b/drivers/usb/serial/quatech2.c @@ -408,16 +408,12 @@ static void qt2_close(struct usb_serial_port *port) { struct usb_serial *serial; struct qt2_port_private *port_priv; - unsigned long flags; int i; serial = port->serial; port_priv = usb_get_serial_port_data(port); - spin_lock_irqsave(&port_priv->urb_lock, flags); usb_kill_urb(port_priv->write_urb); - port_priv->urb_in_use = false; - spin_unlock_irqrestore(&port_priv->urb_lock, flags); /* flush the port transmit buffer */ i = usb_control_msg(serial->dev, |
