Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / drivers / infiniband / core / addr.c

diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 8172d37..f80da50 100644 (file)
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -176,8 +176,8 @@ static void set_timeout(unsigned long time)
        unsigned long delay;
 
        delay = time - jiffies;
-       if ((long)delay <= 0)
-               delay = 1;
+       if ((long)delay < 0)
+               delay = 0;
 
        mod_delayed_work(addr_wq, &work, delay);
 }