---

yaml --- r: 98095 b: refs/heads/master c: 208aefa h: refs/heads/master i: 98093: 17965a2 98091: c425e6a 98087: 1f1af6b 98079: a98418a v: v3
git-mirror · Jun 12, 2008 · c2f2519 · c2f2519
1 parent cb6fe1c
commit c2f2519
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 */