diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-10 18:34:57 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-10 18:34:57 -0500 |
| commit | 9551583e55e26a0940894828c2d1066e9276325e (patch) | |
| tree | ff412949400da94aa788bd094ced2138e9175935 /drivers/infiniband/hw/mthca/mthca_catas.c | |
| parent | a2653ebab3a96c6e6183360821faa492c1f88c3f (diff) | |
| parent | 985834a1c3a2e9639145bd8ea16af6e25f2143ad (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_catas.c')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_catas.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_catas.c b/drivers/infiniband/hw/mthca/mthca_catas.c index 25ebab64bc42..c3bec7490f52 100644 --- 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) | |||
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | spin_lock_irqsave(&catas_lock, flags); | 99 | spin_lock_irqsave(&catas_lock, flags); |
| 100 | if (dev->catas_err.stop) | 100 | if (!dev->catas_err.stop) |
| 101 | mod_timer(&dev->catas_err.timer, | 101 | mod_timer(&dev->catas_err.timer, |
| 102 | jiffies + MTHCA_CATAS_POLL_INTERVAL); | 102 | jiffies + MTHCA_CATAS_POLL_INTERVAL); |
| 103 | spin_unlock_irqrestore(&catas_lock, flags); | 103 | spin_unlock_irqrestore(&catas_lock, flags); |