]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
usbnet: use jiffies in schedule_timeout(), not msecs
authorKulikov Vasiliy <segooon@gmail.com>
Sun, 25 Jul 2010 22:25:42 +0000 (22:25 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 27 Jul 2010 04:05:04 +0000 (21:05 -0700)
usbnet_terminate_urbs() uses schedule_timeout() with argument 3 msecs.
schedule_timeout() uses jiffies as argument, so convert msecs to jiffies
with msecs_to_jiffies().

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/usbnet.c

index f5e1639b3224b9ab3b1a774c0648fb871df4c786..3b03794ac3f56a66a446c098f6003253cd8f09b2 100644 (file)
@@ -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);