lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

phylib: Fix delay argument of schedule_delayed_work

Browse Source 
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>
This commit is contained in:
Atsushi Nemoto
2009-04-16 02:43:37 -07:00
committed by David S. Miller
parent 9d8d05ae66
commit 3664090e19
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/phy/phy.c
View File

@@ -434,7 +434,7 @@ void phy_start_machine(struct phy_device *phydev,
phydev->adjust_state = handler; phydev->adjust_state = handler;
INIT_DELAYED_WORK(&phydev->state_queue, phy_state_machine); 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) if (err < 0)
phy_error(phydev); phy_error(phydev);
schedule_delayed_work(&phydev->state_queue, schedule_delayed_work(&phydev->state_queue, PHY_STATE_TIME * HZ);
jiffies + PHY_STATE_TIME * HZ);
} }