From 88c0249815bff47e415a7052c824c85fc0c53095 Mon Sep 17 00:00:00 2001
From: Kulikov Vasiliy <segooon@gmail.com>
Date: Sun, 25 Jul 2010 22:25:42 +0000
Subject: [PATCH] --- yaml --- r: 203763 b: refs/heads/master c:
 66cc42a4bc23a5f621407d1c23b9fe29d41c92c6 h: refs/heads/master i:   203761:
 c078dfd49dfd8b57265c706dd728579aad8874e2   203759:
 003284c51b472850ab1e17a3d7fc7d3d4d94f223 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/usb/usbnet.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ce970e80a919..13b874b7ada9 100644
--- 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
index f5e1639b3224..3b03794ac3f5 100644
--- 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);