diff options
author | Arnd Bergmann | 2012-03-15 17:11:36 +0100 |
---|---|---|
committer | Arnd Bergmann | 2012-03-15 17:11:40 +0100 |
commit | 86a30bece9ad4cc91c393a829a7b128291e0fb65 (patch) | |
tree | 6cb3e6ad413d74118535f77436056c8d3cfae0eb /drivers/net/usb/usbnet.c | |
parent | MAINTAINERS: ARM: tegra: update Stephen's email address (diff) | |
parent | MAINTAINERS: update MAINTAINERS email entry (diff) | |
download | kernel-qcow2-linux-86a30bece9ad4cc91c393a829a7b128291e0fb65.tar.gz kernel-qcow2-linux-86a30bece9ad4cc91c393a829a7b128291e0fb65.tar.xz kernel-qcow2-linux-86a30bece9ad4cc91c393a829a7b128291e0fb65.zip |
Merge branch 'fixes-non-critical' of git://github.com/hzhuang1/linux into next/maintainers
* 'fixes-non-critical' of git://github.com/hzhuang1/linux:
MAINTAINERS: update MAINTAINERS email entry
MAINTAINERS: update maintainer entry for pxa/hx4700
(update to v3.3-rc7)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/net/usb/usbnet.c')
-rw-r--r-- | drivers/net/usb/usbnet.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index fae0fbd8bc88..81b96e303757 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -589,6 +589,7 @@ static int unlink_urbs (struct usbnet *dev, struct sk_buff_head *q) entry = (struct skb_data *) skb->cb; urb = entry->urb; + spin_unlock_irqrestore(&q->lock, flags); // during some PM-driven resume scenarios, // these (async) unlinks complete immediately retval = usb_unlink_urb (urb); @@ -596,6 +597,7 @@ static int unlink_urbs (struct usbnet *dev, struct sk_buff_head *q) netdev_dbg(dev->net, "unlink urb err, %d\n", retval); else count++; + spin_lock_irqsave(&q->lock, flags); } spin_unlock_irqrestore (&q->lock, flags); return count; |