Merge branch 'for-linus-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / net / irda / timer.c

diff --git a/net/irda/timer.c b/net/irda/timer.c
index 0c4c115a5cab5a39d8f331f446bd03f346a62edd..f2280f73b057d38c58f308c278baec6097d976c7 100644 (file)
--- a/net/irda/timer.c
+++ b/net/irda/timer.c
@@ -60,8 +60,8 @@ void irlap_start_query_timer(struct irlap_cb *self, int S, int s)
         * to avoid messing with for incoming connections requests and
         * to accommodate devices that perform discovery slower than us.
         * Jean II */
-       timeout = ((sysctl_slot_timeout * HZ / 1000) * (S - s)
-                  + XIDEXTRA_TIMEOUT + SMALLBUSY_TIMEOUT);
+       timeout = msecs_to_jiffies(sysctl_slot_timeout) * (S - s)
+                  + XIDEXTRA_TIMEOUT + SMALLBUSY_TIMEOUT;
 
        /* Set or re-set the timer. We reset the timer for each received
         * discovery query, which allow us to automatically adjust to