---

yaml --- r: 311411 b: refs/heads/master c: 5eeb313 h: refs/heads/master i: 311409: c5699bc 311407: 199a75f v: v3
git-mirror · Jun 23, 2012 · 3ff1ef4 · 3ff1ef4
1 parent d09f78a
commit 3ff1ef4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb13c47b8e5ce707268bd38cfd082da377eac4b7
+refs/heads/master: 5eeb3132eb4c5e9ca92e5247fe4575fe9f8c3efe
diff --git a/trunk/drivers/net/usb/usbnet.c b/trunk/drivers/net/usb/usbnet.c
@@ -1515,6 +1515,7 @@ int usbnet_suspend (struct usb_interface *intf, pm_message_t message)
 		spin_lock_irq(&dev->txq.lock);
 		/* don't autosuspend while transmitting */
 		if (dev->txq.qlen && PMSG_IS_AUTO(message)) {
+			dev->suspend_count--;
 			spin_unlock_irq(&dev->txq.lock);
 			return -EBUSY;
 		} else {