Commit a1c33952 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman

USB: serial: fix race between unthrottle and completion handler in visor

usb:usbserial:visor: fix race between unthrottle and completion handler

visor_unthrottle() mustn't resubmit the URB unconditionally
as the URB may still be running.

the same bug as opticon.
Signed-off-by: default avatarOliver Neukum <oliver@neukum.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 63832515
...@@ -595,20 +595,23 @@ static void visor_unthrottle(struct tty_struct *tty) ...@@ -595,20 +595,23 @@ static void visor_unthrottle(struct tty_struct *tty)
{ {
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
struct visor_private *priv = usb_get_serial_port_data(port); struct visor_private *priv = usb_get_serial_port_data(port);
int result; int result, was_throttled;
dbg("%s - port %d", __func__, port->number); dbg("%s - port %d", __func__, port->number);
spin_lock_irq(&priv->lock); spin_lock_irq(&priv->lock);
priv->throttled = 0; priv->throttled = 0;
was_throttled = priv->actually_throttled;
priv->actually_throttled = 0; priv->actually_throttled = 0;
spin_unlock_irq(&priv->lock); spin_unlock_irq(&priv->lock);
port->read_urb->dev = port->serial->dev; if (was_throttled) {
result = usb_submit_urb(port->read_urb, GFP_KERNEL); port->read_urb->dev = port->serial->dev;
if (result) result = usb_submit_urb(port->read_urb, GFP_KERNEL);
dev_err(&port->dev, if (result)
"%s - failed submitting read urb, error %d\n", dev_err(&port->dev,
"%s - failed submitting read urb, error %d\n",
__func__, result); __func__, result);
}
} }
static int palm_os_3_probe(struct usb_serial *serial, static int palm_os_3_probe(struct usb_serial *serial,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment