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

Commit fafa6b10 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by David S. Miller
Browse files

net: usb: cdc-phonet: 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: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f79e7115

drivers/net/usb/cdc-phonet.c

+3 −2
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ static void tx_complete(struct urb *req) 
	struct net_device *dev = skb->dev;

	struct usbpn_dev *pnd = netdev_priv(dev);

	int status = req->status;

	unsigned long flags;



	switch (status) {

	case 0:
@@ -115,10 +116,10 @@ static void tx_complete(struct urb *req) 
	}

	dev->stats.tx_packets++;



	spin_lock(&pnd->tx_lock);

	spin_lock_irqsave(&pnd->tx_lock, flags);

	pnd->tx_queue--;

	netif_wake_queue(dev);

	spin_unlock(&pnd->tx_lock);

	spin_unlock_irqrestore(&pnd->tx_lock, flags);



	dev_kfree_skb_any(skb);

	usb_free_urb(req);