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

Commit 24b2068e authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Greg Kroah-Hartman
Browse files

NFC: nfcmrvl_usb: 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.

Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-wireless@vger.kernel.org
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2df69484

drivers/nfc/nfcmrvl/usb.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -160,13 +160,14 @@ static void nfcmrvl_tx_complete(struct urb *urb) 
	struct nci_dev *ndev = (struct nci_dev *)skb->dev;

	struct nci_dev *ndev = (struct nci_dev *)skb->dev;

	struct nfcmrvl_private *priv = nci_get_drvdata(ndev);

	struct nfcmrvl_private *priv = nci_get_drvdata(ndev);

	struct nfcmrvl_usb_drv_data *drv_data = priv->drv_data;

	struct nfcmrvl_usb_drv_data *drv_data = priv->drv_data;

	unsigned long flags;





	nfc_info(priv->dev, "urb %p status %d count %d\n",

	nfc_info(priv->dev, "urb %p status %d count %d\n",

		 urb, urb->status, urb->actual_length);

		 urb, urb->status, urb->actual_length);





	spin_lock(&drv_data->txlock);

	spin_lock_irqsave(&drv_data->txlock, flags);

	drv_data->tx_in_flight--;

	drv_data->tx_in_flight--;

	spin_unlock(&drv_data->txlock);

	spin_unlock_irqrestore(&drv_data->txlock, flags);





	kfree(urb->setup_packet);

	kfree(urb->setup_packet);

	kfree_skb(skb);

	kfree_skb(skb);