Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / infiniband / hw / mthca / mthca_catas.c

diff --git a/drivers/infiniband/hw/mthca/mthca_catas.c b/drivers/infiniband/hw/mthca/mthca_catas.c
index 25ebab64bc4257a29548d8e398249f38d91e67a8..c3bec7490f52e1dae838288b92ba14e03a6f7d2d 100644 (file)
--- a/drivers/infiniband/hw/mthca/mthca_catas.c
+++ b/drivers/infiniband/hw/mthca/mthca_catas.c
@@ -97,7 +97,7 @@ static void poll_catas(unsigned long dev_ptr)
                }
 
        spin_lock_irqsave(&catas_lock, flags);
-       if (dev->catas_err.stop)
+       if (!dev->catas_err.stop)
                mod_timer(&dev->catas_err.timer,
                          jiffies + MTHCA_CATAS_POLL_INTERVAL);
        spin_unlock_irqrestore(&catas_lock, flags);