diff options
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_iba6120.c')
-rw-r--r-- | drivers/infiniband/hw/qib/qib_iba6120.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/qib/qib_iba6120.c b/drivers/infiniband/hw/qib/qib_iba6120.c index 84e593d6007b..b9bea2ebfd4a 100644 --- a/drivers/infiniband/hw/qib/qib_iba6120.c +++ b/drivers/infiniband/hw/qib/qib_iba6120.c | |||
@@ -1634,9 +1634,7 @@ static irqreturn_t qib_6120intr(int irq, void *data) | |||
1634 | goto bail; | 1634 | goto bail; |
1635 | } | 1635 | } |
1636 | 1636 | ||
1637 | qib_stats.sps_ints++; | 1637 | this_cpu_inc(*dd->int_counter); |
1638 | if (dd->int_counter != (u32) -1) | ||
1639 | dd->int_counter++; | ||
1640 | 1638 | ||
1641 | if (unlikely(istat & (~QLOGIC_IB_I_BITSEXTANT | | 1639 | if (unlikely(istat & (~QLOGIC_IB_I_BITSEXTANT | |
1642 | QLOGIC_IB_I_GPIO | QLOGIC_IB_I_ERROR))) | 1640 | QLOGIC_IB_I_GPIO | QLOGIC_IB_I_ERROR))) |
@@ -1808,7 +1806,8 @@ static int qib_6120_setup_reset(struct qib_devdata *dd) | |||
1808 | * isn't set. | 1806 | * isn't set. |
1809 | */ | 1807 | */ |
1810 | dd->flags &= ~(QIB_INITTED | QIB_PRESENT); | 1808 | dd->flags &= ~(QIB_INITTED | QIB_PRESENT); |
1811 | dd->int_counter = 0; /* so we check interrupts work again */ | 1809 | /* so we check interrupts work again */ |
1810 | dd->z_int_counter = qib_int_counter(dd); | ||
1812 | val = dd->control | QLOGIC_IB_C_RESET; | 1811 | val = dd->control | QLOGIC_IB_C_RESET; |
1813 | writeq(val, &dd->kregbase[kr_control]); | 1812 | writeq(val, &dd->kregbase[kr_control]); |
1814 | mb(); /* prevent compiler re-ordering around actual reset */ | 1813 | mb(); /* prevent compiler re-ordering around actual reset */ |