Skip to content

Commit feae641

Browse files
Sebastian Andrzej Siewiordavem330
authored andcommitted
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>
1 parent ed7aa30 commit feae641

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/net/usb/rtl8150.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@ static void read_bulk_callback(struct urb *urb)
391391
u16 rx_stat;
392392
int status = urb->status;
393393
int result;
394+
unsigned long flags;
394395

395396
dev = urb->context;
396397
if (!dev)
@@ -432,9 +433,9 @@ static void read_bulk_callback(struct urb *urb)
432433
netdev->stats.rx_packets++;
433434
netdev->stats.rx_bytes += pkt_len;
434435

435-
spin_lock(&dev->rx_pool_lock);
436+
spin_lock_irqsave(&dev->rx_pool_lock, flags);
436437
skb = pull_skb(dev);
437-
spin_unlock(&dev->rx_pool_lock);
438+
spin_unlock_irqrestore(&dev->rx_pool_lock, flags);
438439
if (!skb)
439440
goto resched;
440441

0 commit comments

Comments
 (0)