1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index c2a5780cb394..0569bcab02d4 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -1023,7 +1023,7 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
         props->timestamp_mask = 0x7FFFFFFFFFFFFFFFULL;
 
         if (IS_ENABLED(CONFIG_INFINIBAND_ON_DEMAND_PAGING)) {
-                if (MLX5_CAP_GEN(mdev, pg))
+                if (dev->odp_caps.general_caps & IB_ODP_SUPPORT)
                         props->device_cap_flags |= IB_DEVICE_ON_DEMAND_PAGING;
                 props->odp_caps = dev->odp_caps;
         }
@@ -5802,13 +5802,12 @@ static void mlx5_ib_unbind_slave_port(struct mlx5_ib_dev *ibdev,
                 return;
         }
 
-        if (mpi->mdev_events.notifier_call)
-                mlx5_notifier_unregister(mpi->mdev, &mpi->mdev_events);
-        mpi->mdev_events.notifier_call = NULL;
-
         mpi->ibdev = NULL;
 
         spin_unlock(&port->mp.mpi_lock);
+        if (mpi->mdev_events.notifier_call)
+                mlx5_notifier_unregister(mpi->mdev, &mpi->mdev_events);
+        mpi->mdev_events.notifier_call = NULL;
         mlx5_remove_netdev_notifier(ibdev, port_num);
         spin_lock(&port->mp.mpi_lock);
 
@@ -6140,6 +6139,8 @@ static int mlx5_ib_stage_init_init(struct mlx5_ib_dev *dev)
                 dev->port[i].roce.last_port_state = IB_PORT_DOWN;
         }
 
+        mlx5_ib_internal_fill_odp_caps(dev);
+
         err = mlx5_ib_init_multiport_master(dev);
         if (err)
                 return err;
@@ -6564,8 +6565,6 @@ static void mlx5_ib_stage_dev_res_cleanup(struct mlx5_ib_dev *dev)
 
 static int mlx5_ib_stage_odp_init(struct mlx5_ib_dev *dev)
 {
-        mlx5_ib_internal_fill_odp_caps(dev);
-
         return mlx5_ib_odp_init_one(dev);
 }