diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
index 89ea550b07340e39b193d25fe92e6651249ddbb4..4122eaf2619b536616dee049bfd557333997698e 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
@@ -2896,6 +2896,8 @@ static void hclgevf_uninit_client_instance(struct hnae3_client *client,
 
 	/* un-init roce, if it exists */
 	if (hdev->roce_client) {
+		while (test_bit(HCLGEVF_STATE_RST_HANDLING, &hdev->state))
+		       msleep(100);
 		hdev->roce_client->ops->uninit_instance(&hdev->roce, 0);
 		hdev->roce_client = NULL;
 		hdev->roce.client = NULL;
@@ -2905,6 +2907,8 @@ static void hclgevf_uninit_client_instance(struct hnae3_client *client,
 	if (client->ops->uninit_instance && hdev->nic_client &&
 	    client->type != HNAE3_CLIENT_ROCE) {
 		clear_bit(HCLGEVF_STATE_NIC_REGISTERED, &hdev->state);
+		while (test_bit(HCLGEVF_STATE_RST_HANDLING, &hdev->state))
+		       msleep(100);
 
 		client->ops->uninit_instance(&hdev->nic, 0);
 		hdev->nic_client = NULL;