net: hns3: fix improper error handling in the hclge_init_ae_dev()
authorHuazhong Tan <tanhuazhong@huawei.com>
Wed, 30 Jan 2019 20:55:49 +0000 (04:55 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 30 Jan 2019 22:50:03 +0000 (14:50 -0800)
While hclge_init_umv_space() failed in the hclge_init_ae_dev(),
we should undo all the operation which has been done successfully,
the last success operation maybe hclge_mac_mdio_config(), so if
hclge_init_umv_space() failed, we also need to undo it.

Fixes: 288475b2ad01 ("{topost} net: hns3: refine umv space allocation")
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

index 42f0f8824b474f805e4392972a201ba617ee00b9..b531eac12fea21c572ecb7bc2898e0cd2c891443 100644 (file)
@@ -7383,7 +7383,7 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
        ret = hclge_init_umv_space(hdev);
        if (ret) {
                dev_err(&pdev->dev, "umv space init error, ret=%d.\n", ret);
-               goto err_msi_irq_uninit;
+               goto err_mdiobus_unreg;
        }
 
        ret = hclge_mac_init(hdev);