From patchwork Wed Apr 15 16:05:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Atsushi Nemoto X-Patchwork-Id: 26003 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.176.167]) by ozlabs.org (Postfix) with ESMTP id CCCFDDE1A0 for ; Thu, 16 Apr 2009 02:05:55 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752366AbZDOQFv (ORCPT ); Wed, 15 Apr 2009 12:05:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751791AbZDOQFv (ORCPT ); Wed, 15 Apr 2009 12:05:51 -0400 Received: from mba.ocn.ne.jp ([122.1.235.107]:63629 "EHLO smtp.mba.ocn.ne.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751702AbZDOQFu (ORCPT ); Wed, 15 Apr 2009 12:05:50 -0400 Received: from localhost.localdomain (p3165-ipad313funabasi.chiba.ocn.ne.jp [123.217.229.165]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 9386BA0C1; Thu, 16 Apr 2009 01:05:45 +0900 (JST) From: Atsushi Nemoto To: Marcin Slusarz Cc: "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] phylib: Fix delay argument of schedule_delayed_work Date: Thu, 16 Apr 2009 01:05:51 +0900 Message-Id: <1239811551-6101-1-git-send-email-anemo@mba.ocn.ne.jp> X-Mailer: git-send-email 1.5.6.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The commit a390d1f3 ("phylib: convert state_queue work to delayed_work") missed converting 'expires' value to 'delay' value. Signed-off-by: Atsushi Nemoto Acked-by: Marcin Slusarz --- drivers/net/phy/phy.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 3ff1f42..5737b85 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -434,7 +434,7 @@ void phy_start_machine(struct phy_device *phydev, phydev->adjust_state = handler; INIT_DELAYED_WORK(&phydev->state_queue, phy_state_machine); - schedule_delayed_work(&phydev->state_queue, jiffies + HZ); + schedule_delayed_work(&phydev->state_queue, HZ); } /** @@ -937,6 +937,5 @@ static void phy_state_machine(struct work_struct *work) if (err < 0) phy_error(phydev); - schedule_delayed_work(&phydev->state_queue, - jiffies + PHY_STATE_TIME * HZ); + schedule_delayed_work(&phydev->state_queue, PHY_STATE_TIME * HZ); }