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: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c
index 288ecd9991713dcc0fb93372d39eefe3195db87e..3c40312fa453882005cb178933774cbd82a0825d 100644 (file)
--- a/drivers/net/usb/cdc-phonet.c
+++ b/drivers/net/usb/cdc-phonet.c
@@ -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);