From: Kulikov Vasiliy Date: Sun, 25 Jul 2010 22:25:42 +0000 (+0000) Subject: usbnet: use jiffies in schedule_timeout(), not msecs X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=66cc42a4bc23a5f621407d1c23b9fe29d41c92c6;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git usbnet: use jiffies in schedule_timeout(), not msecs 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index f5e1639b3224..3b03794ac3f5 100644 --- a/drivers/net/usb/usbnet.c +++ b/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);