Re: [PATCH] phylib: Fix delay argument of schedule_delayed_work

[Marcin Slusarz]

Atsushi Nemoto wrote:
> The commit a390d1f3 ("phylib: convert state_queue work to
> delayed_work") missed converting 'expires' value to 'delay' value.

Yeah, sorry about that.

> 
> Signed-off-by: Atsushi Nemoto <anemo@xxxxxxxxxxxxx>

Acked-by: Marcin Slusarz <marcin.slusarz@xxxxxxxxx>

> ---
>  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);
>  }

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/