From: Weihang Li <liweih...@hisilicon.com>

If we failed to enable NIC HW error interrupts during client
initialization in some cases, we should do exception handling to clear
flags and free the resources.

Fixes: 00ea6e5fda9d ("net: hns3: delay and separate enabling of NIC and ROCE HW 
errors")
Signed-off-by: Weihang Li <liweih...@hisilicon.com>
Signed-off-by: Huazhong Tan <tanhuazh...@huawei.com>
---
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c 
b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index b0a99c3..b25365c 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -8297,13 +8297,15 @@ static int hclge_init_nic_client_instance(struct 
hnae3_ae_dev *ae_dev,
                goto init_nic_err;
        }
 
-       hnae3_set_client_init_flag(client, ae_dev, 1);
-
        /* Enable nic hw error interrupts */
        ret = hclge_config_nic_hw_error(hdev, true);
-       if (ret)
+       if (ret) {
                dev_err(&ae_dev->pdev->dev,
                        "fail(%d) to enable hw error interrupts\n", ret);
+               goto init_nic_err;
+       }
+
+       hnae3_set_client_init_flag(client, ae_dev, 1);
 
        if (netif_msg_drv(&hdev->vport->nic))
                hclge_info_show(hdev);
-- 
2.7.4

Reply via email to