1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/infiniband/core/counters.c b/drivers/infiniband/core/counters.c
index 01faef7bc061..45d5164e9574 100644
--- a/drivers/infiniband/core/counters.c
+++ b/drivers/infiniband/core/counters.c
@@ -393,6 +393,9 @@ u64 rdma_counter_get_hwstat_value(struct ib_device *dev, u8 port, u32 index)
         u64 sum;
 
         port_counter = &dev->port_data[port].port_counter;
+        if (!port_counter->hstats)
+                return 0;
+
         sum = get_running_counters_hwstat_sum(dev, port, index);
         sum += port_counter->hstats->value[index];
 
@@ -594,7 +597,7 @@ void rdma_counter_init(struct ib_device *dev)
         struct rdma_port_counter *port_counter;
         u32 port;
 
-        if (!dev->ops.alloc_hw_stats || !dev->port_data)
+        if (!dev->port_data)
                 return;
 
         rdma_for_each_port(dev, port) {
@@ -602,6 +605,9 @@ void rdma_counter_init(struct ib_device *dev)
                 port_counter->mode.mode = RDMA_COUNTER_MODE_NONE;
                 mutex_init(&port_counter->lock);
 
+                if (!dev->ops.alloc_hw_stats)
+                        continue;
+
                 port_counter->hstats = dev->ops.alloc_hw_stats(dev, port);
                 if (!port_counter->hstats)
                         goto fail;
@@ -624,9 +630,6 @@ void rdma_counter_release(struct ib_device *dev)
         struct rdma_port_counter *port_counter;
         u32 port;
 
-        if (!dev->ops.alloc_hw_stats)
-                return;
-
         rdma_for_each_port(dev, port) {
                 port_counter = &dev->port_data[port].port_counter;
                 kfree(port_counter->hstats);