---

yaml --- r: 203763 b: refs/heads/master c: 66cc42a h: refs/heads/master i: 203761: c078dfd 203759: 003284c v: v3
git-mirror · Jul 27, 2010 · 88c0249 · 88c0249
1 parent f3af295
commit 88c0249
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db5824dd3d632acd79094b81e07288ba05ae2cc1
+refs/heads/master: 66cc42a4bc23a5f621407d1c23b9fe29d41c92c6
diff --git a/trunk/drivers/net/usb/usbnet.c b/trunk/drivers/net/usb/usbnet.c
@@ -615,7 +615,7 @@ static void usbnet_terminate_urbs(struct usbnet *dev)
 	while (!skb_queue_empty(&dev->rxq)
 		&& !skb_queue_empty(&dev->txq)
 		&& !skb_queue_empty(&dev->done)) {
-			schedule_timeout(UNLINK_TIMEOUT_MS);
+			schedule_timeout(msecs_to_jiffies(UNLINK_TIMEOUT_MS));
 			set_current_state(TASK_UNINTERRUPTIBLE);
 			netif_dbg(dev, ifdown, dev->net,
 				  "waited for %d urb completions\n", temp);