3 files changed, 4 insertions, 2 deletions

diff --git a/drivers/staging/rdma/hfi1/init.c b/drivers/staging/rdma/hfi1/init.c
index 371ed293677d..37b3ce8377b6 100644
--- a/drivers/staging/rdma/hfi1/init.c
+++ b/drivers/staging/rdma/hfi1/init.c
@@ -1324,6 +1324,8 @@ static void cleanup_device_data(struct hfi1_devdata *dd)
         dd->num_send_contexts = 0;
         kfree(dd->send_contexts);
         dd->send_contexts = NULL;
+        kfree(dd->hw_to_sw);
+        dd->hw_to_sw = NULL;
         kfree(dd->boardname);
         vfree(dd->events);
         vfree(dd->status);
diff --git a/drivers/staging/rdma/hfi1/pio.c b/drivers/staging/rdma/hfi1/pio.c
index 859cb4601547..361b43d47c76 100644
--- a/drivers/staging/rdma/hfi1/pio.c
+++ b/drivers/staging/rdma/hfi1/pio.c
@@ -1881,7 +1881,7 @@ void free_pio_map(struct hfi1_devdata *dd)
         /* Free PIO map if allocated */
         if (rcu_access_pointer(dd->pio_map)) {
                 spin_lock_irq(&dd->pio_map_lock);
-                kfree(rcu_access_pointer(dd->pio_map));
+                pio_map_free(rcu_access_pointer(dd->pio_map));
                 RCU_INIT_POINTER(dd->pio_map, NULL);
                 spin_unlock_irq(&dd->pio_map_lock);
                 synchronize_rcu();
diff --git a/drivers/staging/rdma/hfi1/sdma.c b/drivers/staging/rdma/hfi1/sdma.c
index e29b5d394a5f..abb8ebc1fcac 100644
--- a/drivers/staging/rdma/hfi1/sdma.c
+++ b/drivers/staging/rdma/hfi1/sdma.c
@@ -966,7 +966,7 @@ static void sdma_clean(struct hfi1_devdata *dd, size_t num_engines)
                 sde->tx_ring = NULL;
         }
         spin_lock_irq(&dd->sde_map_lock);
-        kfree(rcu_access_pointer(dd->sdma_map));
+        sdma_map_free(rcu_access_pointer(dd->sdma_map));
         RCU_INIT_POINTER(dd->sdma_map, NULL);
         spin_unlock_irq(&dd->sde_map_lock);
         synchronize_rcu();