From dba8a193a77b4c64eabdef4df1a95309049162c0 Mon Sep 17 00:00:00 2001 From: Atsushi Nemoto Date: Thu, 16 Apr 2009 02:43:37 -0700 Subject: [PATCH] --- yaml --- r: 143474 b: refs/heads/master c: 3664090e199f10cb0282097faae8f8ca58c1e4ae h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/phy/phy.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b5c4e4423b48..05d7f713433a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d8d05ae66f40642987486f4b107565fc561a77c +refs/heads/master: 3664090e199f10cb0282097faae8f8ca58c1e4ae diff --git a/trunk/drivers/net/phy/phy.c b/trunk/drivers/net/phy/phy.c index e3b8932d7d74..61755cbd978e 100644 --- a/trunk/drivers/net/phy/phy.c +++ b/trunk/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); } /** @@ -946,6 +946,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); }