adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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:
Oliver Neukum 2009-10-07 11:01:38 +02:00 committed by Greg Kroah-Hartman
parent 6383251545
commit a1c33952b7
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/usb/serial/visor.c
View file

@ -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,