diff --git a/[refs] b/[refs] index 6a282f8fe3b7..d6a5af990572 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b9835108f68938a5f7e74fd2c0fc65da2abad92 +refs/heads/master: 208aefa2451cc1f4d87622cb9b2ca4333afa8337 diff --git a/trunk/drivers/net/r6040.c b/trunk/drivers/net/r6040.c index 169edc154928..858b191517b3 100644 --- a/trunk/drivers/net/r6040.c +++ b/trunk/drivers/net/r6040.c @@ -733,7 +733,7 @@ static void r6040_timer(unsigned long data) } /* Timer active again */ - mod_timer(&lp->timer, jiffies + round_jiffies(HZ)); + mod_timer(&lp->timer, round_jiffies(jiffies + HZ)); } /* Read/set MAC address routines */