[PATCH 5.11 357/775] IB/mlx5: Add mutex destroy call to cap_mask_mutex mutex

[Greg Kroah-Hartman]

From: Parav Pandit <pa...@nvidia.com>

[ Upstream commit ab40530a2e0a7aca9a5187824c4fb072f3916e85 ]

mutex_destroy() call for device's cap_mask_mutex mutex is missing, let's
add it to annotate destruction.

Fixes: e126ba97dba9 ("mlx5: Add driver for Mellanox Connect-IB adapters")
Link: https://lore.kernel.org/r/20210113121703.559778-4-l...@kernel.org
Signed-off-by: Parav Pandit <pa...@nvidia.com>
Signed-off-by: Leon Romanovsky <leo...@nvidia.com>
Signed-off-by: Jason Gunthorpe <j...@nvidia.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/infiniband/hw/mlx5/main.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/infiniband/hw/mlx5/main.c 
b/drivers/infiniband/hw/mlx5/main.c
index aabdc07e47537..9b772457286f2 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -3927,7 +3927,7 @@ static void mlx5_ib_stage_init_cleanup(struct mlx5_ib_dev 
*dev)
        mlx5_ib_cleanup_multiport_master(dev);
        WARN_ON(!xa_empty(&dev->odp_mkeys));
        cleanup_srcu_struct(&dev->odp_srcu);
-
+       mutex_destroy(&dev->cap_mask_mutex);
        WARN_ON(!xa_empty(&dev->sig_mrs));
        WARN_ON(!bitmap_empty(dev->dm.memic_alloc_pages, MLX5_MAX_MEMIC_PAGES));
 }
@@ -3978,6 +3978,10 @@ static int mlx5_ib_stage_init_init(struct mlx5_ib_dev 
*dev)
        dev->ib_dev.dev.parent          = mdev->device;
        dev->ib_dev.lag_flags           = RDMA_LAG_FLAGS_HASH_ALL_SLAVES;
 
+       err = init_srcu_struct(&dev->odp_srcu);
+       if (err)
+               goto err_mp;
+
        mutex_init(&dev->cap_mask_mutex);
        INIT_LIST_HEAD(&dev->qp_list);
        spin_lock_init(&dev->reset_flow_resource_lock);
@@ -3987,11 +3991,6 @@ static int mlx5_ib_stage_init_init(struct mlx5_ib_dev 
*dev)
 
        spin_lock_init(&dev->dm.lock);
        dev->dm.dev = mdev;
-
-       err = init_srcu_struct(&dev->odp_srcu);
-       if (err)
-               goto err_mp;
-
        return 0;
 
 err_mp:
-- 
2.27.0