diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2018-06-20 21:31:21 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-22 13:57:45 +0900 |
| commit | feae641d2914e1559a29b9bf2e349578c3634b00 (patch) | |
| tree | 399eee4d28f7598d5ad59392bc86e7c70d94a4b6 | |
| parent | ed7aa30e861510043f602b39f460c90aba792776 (diff) | |
| download | linux-stable-feae641d2914e1559a29b9bf2e349578c3634b00.tar.gz linux-stable-feae641d2914e1559a29b9bf2e349578c3634b00.tar.bz2 linux-stable-feae641d2914e1559a29b9bf2e349578c3634b00.zip | |
net: usb: rtl8150: 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: Petko Manolov <petkan@nucleusys.com>
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>
| -rw-r--r-- | drivers/net/usb/rtl8150.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c index 5f565bd574da..0e81d4c441d9 100644 --- a/drivers/net/usb/rtl8150.c +++ b/drivers/net/usb/rtl8150.c @@ -391,6 +391,7 @@ static void read_bulk_callback(struct urb *urb) u16 rx_stat; int status = urb->status; int result; + unsigned long flags; dev = urb->context; if (!dev) @@ -432,9 +433,9 @@ static void read_bulk_callback(struct urb *urb) netdev->stats.rx_packets++; netdev->stats.rx_bytes += pkt_len; - spin_lock(&dev->rx_pool_lock); + spin_lock_irqsave(&dev->rx_pool_lock, flags); skb = pull_skb(dev); - spin_unlock(&dev->rx_pool_lock); + spin_unlock_irqrestore(&dev->rx_pool_lock, flags); if (!skb) goto resched; |