Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4bf25b3 authored by John Ogness's avatar John Ogness Committed by Johan Hovold
Browse files

USB: serial: sierra: use irqsave() in USB's complete callback 



The USB completion callback does not disable interrupts while acquiring
the lock. We want to remove the local_irq_disable() invocation from
__usb_hcd_giveback_urb() and therefore it is required for the callback
handler to disable the interrupts while acquiring the lock.
The callback may be invoked either in IRQ or BH context depending on the
USB host controller.
Use the _irqsave() variant of the locking primitives.

Signed-off-by: default avatarJohn Ogness <john.ogness@linutronix.de>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent e6087001

drivers/usb/serial/sierra.c

+5 −4
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ static void sierra_outdat_callback(struct urb *urb) 
	struct sierra_port_private *portdata = usb_get_serial_port_data(port);

	struct sierra_intf_private *intfdata;

	int status = urb->status;

	unsigned long flags;



	intfdata = usb_get_serial_data(port->serial);
@@ -419,12 +420,12 @@ static void sierra_outdat_callback(struct urb *urb) 
		dev_dbg(&port->dev, "%s - nonzero write bulk status "

		    "received: %d\n", __func__, status);



	spin_lock(&portdata->lock);

	spin_lock_irqsave(&portdata->lock, flags);

	--portdata->outstanding_urbs;

	spin_unlock(&portdata->lock);

	spin_lock(&intfdata->susp_lock);

	spin_unlock_irqrestore(&portdata->lock, flags);

	spin_lock_irqsave(&intfdata->susp_lock, flags);

	--intfdata->in_flight;

	spin_unlock(&intfdata->susp_lock);

	spin_unlock_irqrestore(&intfdata->susp_lock, flags);



	usb_serial_port_softint(port);

}