summaryrefslogtreecommitdiff
path: root/net/irda
diff options
context:
space:
mode:
authorXi Wang <xi.wang@gmail.com>2011-12-21 02:57:16 +0000
committerDavid S. Miller <davem@davemloft.net>2011-12-21 15:46:22 -0500
commit7d6c429b263c2f735f3df8c282cc77a8659e5d74 (patch)
treebacd15d0f680661de4ba72f167df5052f1cf0ecf /net/irda
parent5b9932685fa40088e989be0d56f7e41e362e9450 (diff)
downloadlinux-3.10-7d6c429b263c2f735f3df8c282cc77a8659e5d74.tar.gz
linux-3.10-7d6c429b263c2f735f3df8c282cc77a8659e5d74.tar.bz2
linux-3.10-7d6c429b263c2f735f3df8c282cc77a8659e5d74.zip
irda: use msecs_to_jiffies() rather than manual calculation
Also use mod_timer() instead of direct assignment to "expires". Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda')
-rw-r--r--net/irda/af_irda.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index c24f25ab67d..bb14c347768 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,