mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
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: Oliver Neukum <oliver@neukum.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
6383251545
commit
a1c33952b7
1 changed files with 9 additions and 6 deletions
|
@ -595,20 +595,23 @@ static void visor_unthrottle(struct tty_struct *tty)
|
|||
{
|
||||
struct usb_serial_port *port = tty->driver_data;
|
||||
struct visor_private *priv = usb_get_serial_port_data(port);
|
||||
int result;
|
||||
int result, was_throttled;
|
||||
|
||||
dbg("%s - port %d", __func__, port->number);
|
||||
spin_lock_irq(&priv->lock);
|
||||
priv->throttled = 0;
|
||||
was_throttled = priv->actually_throttled;
|
||||
priv->actually_throttled = 0;
|
||||
spin_unlock_irq(&priv->lock);
|
||||
|
||||
port->read_urb->dev = port->serial->dev;
|
||||
result = usb_submit_urb(port->read_urb, GFP_KERNEL);
|
||||
if (result)
|
||||
dev_err(&port->dev,
|
||||
"%s - failed submitting read urb, error %d\n",
|
||||
if (was_throttled) {
|
||||
port->read_urb->dev = port->serial->dev;
|
||||
result = usb_submit_urb(port->read_urb, GFP_KERNEL);
|
||||
if (result)
|
||||
dev_err(&port->dev,
|
||||
"%s - failed submitting read urb, error %d\n",
|
||||
__func__, result);
|
||||
}
|
||||
}
|
||||
|
||||
static int palm_os_3_probe(struct usb_serial *serial,
|
||||
|
|
Loading…
Reference in a new issue