diff options
| author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2009-04-16 02:43:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-16 03:13:07 -0700 |
| commit | 3664090e199f10cb0282097faae8f8ca58c1e4ae (patch) | |
| tree | 7197bd165cb21b8341b85adde180e8d063547404 /drivers/net/phy | |
| parent | 9d8d05ae66f40642987486f4b107565fc561a77c (diff) | |
| download | op-kernel-dev-3664090e199f10cb0282097faae8f8ca58c1e4ae.zip op-kernel-dev-3664090e199f10cb0282097faae8f8ca58c1e4ae.tar.gz | |
phylib: Fix delay argument of schedule_delayed_work
The commit a390d1f3 ("phylib: convert state_queue work to
delayed_work") missed converting 'expires' value to 'delay' value.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Acked-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | 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 e3b8932..61755cb 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); } /** @@ -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); } |
