diff --git a/[refs] b/[refs]
index 9276fde51beb..1723a4c2afdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4522e08ced48baaf28990e2674e940aae9940310
+refs/heads/master: c036925ac0e940a4e8525b08e89d2c64fe282c51
diff --git a/trunk/drivers/infiniband/hw/mthca/mthca_catas.c b/trunk/drivers/infiniband/hw/mthca/mthca_catas.c
index 50e2792e60c1..cc440f90000b 100644
--- a/trunk/drivers/infiniband/hw/mthca/mthca_catas.c
+++ b/trunk/drivers/infiniband/hw/mthca/mthca_catas.c
@@ -135,7 +135,7 @@ static void poll_catas(unsigned long dev_ptr)
 		}
 
 	mod_timer(&dev->catas_err.timer,
-		  jiffies + MTHCA_CATAS_POLL_INTERVAL);
+		  round_jiffies(jiffies + MTHCA_CATAS_POLL_INTERVAL));
 }
 
 void mthca_start_catas_poll(struct mthca_dev *dev)