net/ngbe: fix customized device probing

[dpdk.git] / drivers / common / mlx5 / mlx5_common_mr.c

diff --git a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c
index 5f7e4f6..06e4c8f 100644 (file)
--- a/drivers/common/mlx5/mlx5_common_mr.c
+++ b/drivers/common/mlx5/mlx5_common_mr.c
@@ -516,8 +516,7 @@ mlx5_mr_free(struct mlx5_mr *mr, mlx5_dereg_mr_t dereg_mr_cb)
                return;
        DRV_LOG(DEBUG, "freeing MR(%p):", (void *)mr);
        dereg_mr_cb(&mr->pmd_mr);
-       if (mr->ms_bmp != NULL)
-               rte_bitmap_free(mr->ms_bmp);
+       rte_bitmap_free(mr->ms_bmp);
        mlx5_free(mr);
 }
 
@@ -1290,11 +1289,12 @@ mlx5_range_from_mempool_chunk(struct rte_mempool *mp, void *opaque,
                              unsigned int idx)
 {
        struct mlx5_range *ranges = opaque, *range = &ranges[idx];
+       uintptr_t start = (uintptr_t)memhdr->addr;
        uint64_t page_size = rte_mem_page_size();
 
        RTE_SET_USED(mp);
-       range->start = RTE_ALIGN_FLOOR((uintptr_t)memhdr->addr, page_size);
-       range->end = RTE_ALIGN_CEIL(range->start + memhdr->len, page_size);
+       range->start = RTE_ALIGN_FLOOR(start, page_size);
+       range->end = RTE_ALIGN_CEIL(start + memhdr->len, page_size);
 }
 
 /**