---

yaml --- r: 279043 b: refs/heads/master c: 7d6c429 h: refs/heads/master i: 279041: 5c28c21 279039: f957972 v: v3
git-mirror · Dec 21, 2011 · 12849a6 · 12849a6
1 parent 837ddf4
commit 12849a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b9932685fa40088e989be0d56f7e41e362e9450
+refs/heads/master: 7d6c429b263c2f735f3df8c282cc77a8659e5d74
diff --git a/trunk/net/irda/af_irda.c b/trunk/net/irda/af_irda.c
@@ -2558,8 +2558,8 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
 			self->errno = 0;
 			setup_timer(&self->watchdog, irda_discovery_timeout,
 					(unsigned long)self);
-			self->watchdog.expires = jiffies + (val * HZ/1000);
-			add_timer(&(self->watchdog));
+			mod_timer(&self->watchdog,
+				  jiffies + msecs_to_jiffies(val));
 
 			/* Wait for IR-LMP to call us back */
 			__wait_event_interruptible(self->query_wait,