From: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
Date: Thu, 15 May 2008 21:26:22 +0000 (+0200)
Subject: drivers/net/r6040.c: correct bad use of round_jiffies()
X-Git-Tag: v2.6.26-rc7~40^2~4^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=208aefa2451cc1f4d87622cb9b2ca4333afa8337;p=linux-2.6

drivers/net/r6040.c: correct bad use of round_jiffies()

Compared to other places in the kernel, I think that this driver misuses
the function round_jiffies.

Signed-off-by: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---

diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 169edc1549..858b191517 100644
--- a/drivers/net/r6040.c
+++ b/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 */