X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=net%2Firda%2Faf_irda.c;h=bb14c34776801e7dd43ce13c8552794d89a5c197;hb=72f318897e50c29b91efd1ed24515a93c138a2ba;hp=c24f25ab67d324f64f67126ed8f27639d5988a34;hpb=0a2d31b62dba9b5b92a38c67c9cc42630513662a;p=karo-tx-linux.git

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index c24f25ab67d3..bb14c3477680 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -2558,8 +2558,8 @@ bed:
 			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,