diff options
| author | Kulikov Vasiliy <segooon@gmail.com> | 2010-07-25 22:25:42 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-26 21:05:04 -0700 |
| commit | 66cc42a4bc23a5f621407d1c23b9fe29d41c92c6 (patch) | |
| tree | 676739b334e957ac65eb7e36699acfc154ebd6d6 | |
| parent | db5824dd3d632acd79094b81e07288ba05ae2cc1 (diff) | |
| download | linux-3.10-66cc42a4bc23a5f621407d1c23b9fe29d41c92c6.tar.gz linux-3.10-66cc42a4bc23a5f621407d1c23b9fe29d41c92c6.tar.bz2 linux-3.10-66cc42a4bc23a5f621407d1c23b9fe29d41c92c6.zip | |
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 <segooon@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/usb/usbnet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index f5e1639b322..3b03794ac3f 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); |