Commit e1c35d3e authored by chenyi's avatar chenyi
Browse files

Revert "net: hns3: release PTP resources if pf initialization failed" 

driver inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VALY


CVE: NA

--------------------------------------------------------

This reverts commit a6f262bd.

Fixes: a6f262bd ("net: hns3: release PTP resources if pf initialization failed")

Signed-off-by: default avatarchenyi <chenyi211@huawei.com>
parent 4f3b4e79

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+2 −4
Original line number Diff line number Diff line
@@ -12676,13 +12676,13 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) 


	ret = hclge_update_port_info(hdev);

	if (ret)

		goto err_ptp_uninit;

		goto err_sysfs_unregister;



#if IS_ENABLED(CONFIG_UB_UDMA_HNS3)

	ret = hclge_set_fastpath_cmd(ae_dev, true);

	if (ret) {

		dev_err(&pdev->dev, "failed to init fastpath, ret = %d\n", ret);

		goto err_ptp_uninit;

		goto err_sysfs_unregister;

	}

#endif
@@ -12736,8 +12736,6 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) 


err_sysfs_unregister:

	hclge_unregister_sysfs(hdev);

err_ptp_uninit:

	hclge_ptp_uninit(hdev);

err_mdiobus_unreg:

	if (hdev->hw.mac.phydev)

		mdiobus_unregister(hdev->hw.mac.mdio_bus);