From patchwork Mon Jul 26 08:25:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kulikov Vasiliy X-Patchwork-Id: 59898 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 38688B6EEF for ; Mon, 26 Jul 2010 18:26:45 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753928Ab0GZI0Z (ORCPT ); Mon, 26 Jul 2010 04:26:25 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:50806 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753112Ab0GZI0W (ORCPT ); Mon, 26 Jul 2010 04:26:22 -0400 Received: by ewy23 with SMTP id 23so739854ewy.19 for ; Mon, 26 Jul 2010 01:26:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=wvd98lCJK4S1j99mwY00jbUtkuILqXSZT+r6XtYoSyE=; b=Tg21jbeUXxQs6fDurw0STKoMHPbgGy20kU2MgiDbb+sDit5tpu80Dv/d+yTY14bjWX BBhi6hRzRliNZx9XutO6VGqT9GIlB4kUdK3P2QLtYF4yDVuixpEPmXjNC7Xm3B2Hddo9 C+IsFkJLUbJ8YpNHMiWmhEPGIgAtwza1VwCyQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=LgWO93Xq+fHGh5gJtC2lGBYdJGbV8EfcFz+KPqWLuofMNllf1pRTkZ/0QOJ7hs2+Ls PJdanblS4TKnfKUWMRXk3UJXbxoWYMEJBhLaPPKCeo4L4L/smGtAtbGlnduqX9LdVwHl 6ZCEjzy7hNoMY2NOYUWAq+4B3Kszqznpx0Z3s= Received: by 10.213.10.67 with SMTP id o3mr6166965ebo.58.1280132780740; Mon, 26 Jul 2010 01:26:20 -0700 (PDT) Received: from localhost ([213.87.88.32]) by mx.google.com with ESMTPS id a48sm5278406eei.18.2010.07.26.01.26.00 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 26 Jul 2010 01:26:19 -0700 (PDT) From: Kulikov Vasiliy To: kernel-janitors@vger.kernel.org Cc: David Brownell , Greg Kroah-Hartman , "David S. Miller" , Ben Hutchings , Joe Perches , Stephen Hemminger , Jussi Kivilinna , netdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] usbnet: use jiffies in schedule_timeout(), not msecs Date: Mon, 26 Jul 2010 12:25:42 +0400 Message-Id: <1280132742-8126-1-git-send-email-segooon@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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 7eab407..b243386 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -624,7 +624,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);